Merge branch 'ms5' into 'beta'

Ms5 See merge request Griefed/ServerPackCreator!552
Griefed · Dec 1, 2023 · 1c45bfa · 1c45bfa
2 parents 9200a19 + 3542897
commit 1c45bfa
Show file tree

Hide file tree

Showing 40 changed files with 273 additions and 407 deletions.
diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml
@@ -40,11 +40,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -104,11 +104,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -161,11 +161,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -221,12 +221,12 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         id: java
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -317,11 +317,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -374,12 +374,12 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         id: java
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
@@ -38,11 +38,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -102,11 +102,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -159,11 +159,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -219,12 +219,12 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         id: java
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -314,11 +314,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
 
       - name: Grant execute permission for gradlew
@@ -371,12 +371,12 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         id: java
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -555,11 +555,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,11 +16,11 @@ jobs:
         id: branch-name
         uses: tj-actions/[email protected]
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -62,11 +62,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -108,11 +108,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -158,12 +158,12 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         id: java
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -242,11 +242,11 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 
@@ -288,12 +288,12 @@ jobs:
           fetch-depth: 0
 
       # BUILD PROJECT AND PUBLISH
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         id: java
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache: 'gradle'
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ workflow:
 
 Build Test:
   stage: Tests
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   before_script:
     - echo "**** Running in $CI_JOB_ID ****"
     - echo "**** Java version ****"
@@ -119,7 +119,7 @@ Generate Release:
 
 Build Release:
   stage: Build Release
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   needs:
     - job: Build Test
       artifacts: false
@@ -168,7 +168,7 @@ Build Release:
 
 Sign Java Publication:
   stage: Build Release
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   needs:
     - job: Build Release
       artifacts: false
@@ -206,7 +206,7 @@ Sign Java Publication:
 
 Publish GitHub:
   stage: Build Release
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   needs:
     - job: Sign Java Publication
       optional: false
@@ -238,7 +238,7 @@ Publish GitHub:
 
 Publish GitLab:
   stage: Build Release
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   needs:
     - job: Sign Java Publication
       optional: false
@@ -270,7 +270,7 @@ Publish GitLab:
 
 Publish GitGriefed:
   stage: Build Release
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   needs:
     - job: Sign Java Publication
       optional: false
@@ -302,7 +302,7 @@ Publish GitGriefed:
 
 Publish OSSRH:
   stage: Build Release
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   needs:
     - job: Sign Java Publication
       optional: false
@@ -380,7 +380,7 @@ Publish OSSRH:
 
 pages:
   stage: Documentation
-  image: docker.griefed.dev/eclipse-temurin:17-jdk
+  image: docker.griefed.dev/eclipse-temurin:21-jdk
   allow_failure: true
   before_script:
     - chmod +x gradlew

diff --git a/README.md b/README.md
@@ -143,7 +143,7 @@ Should you at any point want to revisit said guide, simply hit *About -> Step-By
 
 ##### Required:
 
-* Using the JAR-file release requires Java 17.
+* Using the JAR-file release requires Java 21.
 * Working internet connection recommended.
 
 The installers ship their own Java installations.

diff --git a/buildSrc/src/main/kotlin/de/griefed/common/gradle/constant/Version.kt b/buildSrc/src/main/kotlin/de/griefed/common/gradle/constant/Version.kt
@@ -1,7 +1,7 @@
 package de.griefed.common.gradle.constant
 
 // is used to set the target java version
-const val JDK_VERSION = "17"
+const val JDK_VERSION = "21"
 
 // is used to set the "languageVersion" and "apiVersion" in KotlinCompile
 // should be the same as the embedded Kotlin runtime version in Gradle

diff --git a/buildSrc/src/main/kotlin/serverpackcreator.kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/serverpackcreator.kotlin-multiplatform-conventions.gradle.kts
@@ -15,6 +15,9 @@ repositories {
 kotlin {
     jvm {
         compilations.all {
+            val list = kotlinOptions.freeCompilerArgs.toMutableList()
+            list.add("-Xexpect-actual-classes")
+            kotlinOptions.freeCompilerArgs = list.toList()
             kotlinOptions.allWarningsAsErrors = false
             kotlinOptions.apiVersion = KOTLIN_VERSION
             kotlinOptions.jvmTarget = JDK_VERSION

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ kotlin.js.generate.executable.default=false
 kotlin.build.report.enable=true
 kotlinVersion=1.9.21
 kotlinMajor=1.9
-jdkVersion=17
+jdkVersion=21
 
 group=de.griefed.serverpackcreator
 version=dev
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME