diff --git a/build.gradle.kts b/build.gradle.kts old mode 100644 new mode 100755 index 4b00934..2d78f55 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,57 +1,63 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { - id("java") - id("java-library") + kotlin("jvm") version "2.2.0" id("maven-publish") - kotlin("jvm") version "1.7.0" + kotlin("kapt") version "2.2.0" + id("java") } +val javaVersion = 21 group = "ru.d3st0ny" -version = "0.3" +version = "1.0" repositories { mavenCentral() - maven { url = uri("https://libraries.minecraft.net") } - maven { url = uri("https://papermc.io/repo/repository/maven-public/") } + mavenLocal() + maven("https://jitpack.io") + maven("https://libraries.minecraft.net") + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.codemc.io/repository/maven-snapshots/") } dependencies { + compileOnly("io.papermc.paper:paper-api:${project.property("paper_api_version")}") + //compileOnly("io.papermc.paper:paper-mojangapi:1.20.6-R0.1-SNAPSHOT") api("com.mojang:brigadier:1.0.18") { exclude("com.google.guava", "guava") } - compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT") - compileOnly("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") } publishing { - publications.create("maven") { - artifactId = project.name.toLowerCase() + publications.create("maven", MavenPublication::class) { + artifactId = project.name.lowercase() groupId = "${project.group}" version = "${project.version}" - from(components["java"]) + from(components["kotlin"]) } repositories { maven { - url = uri("https://gitea.destony.dev/api/packages/Polygon/maven") - name = "gitea" + name = "polygon" + url = uri("https://maven.destony.dev/releases") credentials { - username = System.getenv("gitUsername") - password = System.getenv("gitPassword") + username = System.getenv("username") + password = System.getenv("secret") } } } } -val javaVersion = 17 - tasks { // USE THIS TASK FOR BUILD & PUBLISH TO MAVEN REPO publish { - dependsOn(assemble) + dependsOn(build) } - // USE THIS TASK FOR BUILD - assemble {} + compileKotlin { + compilerOptions.jvmTarget.set(JvmTarget.fromTarget(javaVersion.toString())) + compilerOptions.freeCompilerArgs.set(listOf("-opt-in=kotlin.io.path.ExperimentalPathApi")) + } compileJava { options.encoding = Charsets.UTF_8.name() @@ -65,8 +71,4 @@ tasks { processResources { filteringCharset = Charsets.UTF_8.name() } -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersion)) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 index 29e08e8..34f79ec --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +paper_api_version=1.21.7-R0.1-SNAPSHOT \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 index 60c76b3..40957b2 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/settings.gradle.kts b/settings.gradle.kts old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/AbstractAdajency.java b/src/main/java/ru/d3st0ny/adajency/AbstractAdajency.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/Adajency.java b/src/main/java/ru/d3st0ny/adajency/Adajency.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/AdajencyProvider.java b/src/main/java/ru/d3st0ny/adajency/AdajencyProvider.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/BrigadierUnsupportedException.java b/src/main/java/ru/d3st0ny/adajency/BrigadierUnsupportedException.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/MinecraftArgumentType.java b/src/main/java/ru/d3st0ny/adajency/MinecraftArgumentType.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/PaperAdajency.java b/src/main/java/ru/d3st0ny/adajency/PaperAdajency.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/ReflectionAdajency.java b/src/main/java/ru/d3st0ny/adajency/ReflectionAdajency.java old mode 100644 new mode 100755 diff --git a/src/main/java/ru/d3st0ny/adajency/ReflectionUtil.java b/src/main/java/ru/d3st0ny/adajency/ReflectionUtil.java old mode 100644 new mode 100755