From 6402aa2181549a286a34a23d57420ed1d2937129 Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Sun, 16 Jun 2024 21:50:42 -0400 Subject: [PATCH] [build] fuck it 1.20.6 only --- .github/workflows/release.yml | 4 ++-- buildSrc/src/main/kotlin/java-plugin.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 ++-- paper/build.gradle.kts | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d85b4a..5dad1a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,11 +21,11 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 check-latest: true - name: Gradle Properties Import. diff --git a/buildSrc/src/main/kotlin/java-plugin.gradle.kts b/buildSrc/src/main/kotlin/java-plugin.gradle.kts index 4251aeb..7f0f291 100644 --- a/buildSrc/src/main/kotlin/java-plugin.gradle.kts +++ b/buildSrc/src/main/kotlin/java-plugin.gradle.kts @@ -26,14 +26,14 @@ repositories { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } } tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(21) } javadoc { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28ad480..a9f57e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # Minecraft -paper = "1.20.4-R0.1-SNAPSHOT" -minecraft = "1.20.4" +paper = "1.20.6-R0.1-SNAPSHOT" +minecraft = "1.20.6" # Plugins itemsadder = "3.6.3-beta-14" diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index a600817..cb96000 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -65,7 +65,7 @@ tasks { url("https://download.luckperms.net/1544/bukkit/loader/LuckPerms-Bukkit-5.4.131.jar") } - minecraftVersion("1.20.4") + minecraftVersion(libs.versions.minecraft.get()) } assemble { @@ -89,8 +89,7 @@ tasks { inputs.properties("version" to project.version) inputs.properties("group" to project.group) inputs.properties("description" to project.properties["description"]) - //inputs.properties("apiVersion" to libs.versions.minecraft.get()) - inputs.properties("apiVersion" to "1.20") + inputs.properties("apiVersion" to libs.versions.minecraft.get()) inputs.properties("authors" to project.properties["authors"]) inputs.properties("website" to project.properties["website"])