feat: compile under Java 21 LTS (RoinujNosde#446)

ArmaRealms · Jan 19, 2025 · 13cf348 · 13cf348
1 parent b37512b
commit 13cf348
Show file tree

Hide file tree

Showing 8 changed files with 370 additions and 468 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -15,23 +15,23 @@ jobs:
       fail-fast: true
       max-parallel: 4
       matrix:
-        java-version: [ 16, 17 ]
+        java-version: [ 21 ]
     runs-on: ubuntu-latest
     name: Java ${{ matrix.java-version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Set up JDK ${{ matrix.java-version }}"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "${{ matrix.java-version }}"
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven
         run: ./mvnw -B -U package --file pom.xml
       - name: Upload Build Artifact
-        if: "${{ matrix.java-version == 16 }}"
-        uses: actions/upload-artifact@v3
+        if: "${{ matrix.java-version == 21 }}"
+        uses: actions/upload-artifact@v4
         with:
           name: SimpleClans
           path: target/SimpleClans.jar
diff --git a/.github/workflows/publish_curseforge.yml b/.github/workflows/publish_curseforge.yml
@@ -7,13 +7,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 16
-      uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 16
+        java-version: 21
         cache: 'maven'
-        distribution: 'adopt'
+        distribution: 'temurin'
     - name: Build with Maven
       run: ./mvnw -B package --file pom.xml
     - name: Upload artifact
@@ -26,6 +26,6 @@ jobs:
         changelog: ${{ github.event.release.body }}
         changelog_type: markdown
         display_name: ${{ github.event.release.tag_name }}
-        game_versions: 8849,8503,7915,7667,7330,7105,6588,630,591,585,531
+        game_versions: 11515,9974,9190,8849,8503,7915,7667,7330,7105,6588,630,591,585,531
         release_type: release
-        relations: vault:optionalDependency,worldguard:optionalDependency,grief-prevention:optionalDependency
+        relations: vault:optionalDependency,worldguard:optionalDependency,grief-prevention:optionalDependency,plotsquared:optionalDependency
diff --git a/.github/workflows/publish_modrinth.yml b/.github/workflows/publish_modrinth.yml
@@ -7,13 +7,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 16
-      uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 16
+        java-version: 21
         cache: 'maven'
-        distribution: 'adopt'
+        distribution: 'temurin'
     - name: Build with Maven
       run: ./mvnw -B package --file pom.xml
     - name: Upload artifact
@@ -25,7 +25,7 @@ jobs:
         changelog: ${{ github.event.release.body }}
         name: ${{ github.event.release.tag_name }}
         version: ${{ github.event.release.tag_name }}
-        game_versions: 1.19,1.18,1.17,1.16,1.15,1.14,1.13,1.12,1.11,1.10,1.9,1.8
+        game_versions: 1.21,1.20,1.19,1.18,1.17,1.16,1.15,1.14,1.13,1.12,1.11,1.10,1.9,1.8
         release_type: release
         loaders: spigot
         featured: true
diff --git a/.github/workflows/publish_reposilite.yml b/.github/workflows/publish_reposilite.yml
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 16
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 16
+          java-version: 21
           server-id: reposilite # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           cache: 'maven'
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Build with Maven
         run: ./mvnw -B package --file pom.xml
       - name: Publish to Reposilite

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip