build: base Java 21, switch to 21+dev-SNAPSHOT

DeathPhoenix22 · Nov 1, 2023 · dd4fbfd · dd4fbfd
1 parent 76cdf21
commit dd4fbfd
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/deploy_SNAPSHOT.yml b/.github/workflows/deploy_SNAPSHOT.yml
@@ -12,11 +12,11 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/latest_jdk.yml b/.github/workflows/latest_jdk.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
-        java: [ 19-ea ]
+        java: [ 21 ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: 'Checkout'

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -18,7 +18,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
 
     - name: Cache maven deps
       uses: actions/cache@v3

diff --git a/fxgl-controllerinput/pom.xml b/fxgl-controllerinput/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-core/pom.xml b/fxgl-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-entity/pom.xml b/fxgl-entity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-gameplay/pom.xml b/fxgl-gameplay/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-io/pom.xml b/fxgl-io/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-samples/pom.xml b/fxgl-samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-scene/pom.xml b/fxgl-scene/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-test/pom.xml b/fxgl-test/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-tools/pom.xml b/fxgl-tools/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl-zdeploy/pom.xml b/fxgl-zdeploy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fxgl/pom.xml b/fxgl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>fxgl-framework</artifactId>
         <groupId>com.github.almasb</groupId>
-        <version>17+dev-SNAPSHOT</version>
+        <version>21+dev-SNAPSHOT</version>
     </parent>
 
     <artifactId>fxgl</artifactId>

diff --git a/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt b/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt
@@ -316,7 +316,7 @@ class FXGLAssetLoaderService : AssetLoaderService() {
      *
      * @return parsed object with [type] or Optional.empty() if errors
      */
-    fun <T> loadJSON(name: String, type: Class<T>): Optional<T> {
+    fun <T> loadJSON(name: String, type: Class<T>): Optional<T & Any> {
         return loadJSON(getURL(ASSETS_DIR + name), type)
     }
 
@@ -326,7 +326,7 @@ class FXGLAssetLoaderService : AssetLoaderService() {
      *
      * @return parsed object with [type] or Optional.empty() if errors
      */
-    fun <T> loadJSON(url: URL, type: Class<T>): Optional<T> {
+    fun <T> loadJSON(url: URL, type: Class<T>): Optional<T & Any> {
         if (url === NULL_URL) {
             log.warning("Failed to load JSON: URL is not valid")
             return Optional.empty()

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.almasb</groupId>
     <artifactId>fxgl-framework</artifactId>
-    <version>17+dev-SNAPSHOT</version>
+    <version>21+dev-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -63,15 +63,15 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <source.version>17</source.version>
+        <source.version>21</source.version>
         <fxgl.version>${project.version}</fxgl.version>
 
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>dd.MM.yyyy HH.mm</maven.build.timestamp.format>
 
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
 
         <!-- plugins -->
@@ -90,7 +90,7 @@
 
         <!-- dependencies -->
         <jfx.version>20</jfx.version>
-        <kotlin.version>1.8.10</kotlin.version>
+        <kotlin.version>1.9.20</kotlin.version>
         <attach.version>4.0.17</attach.version>
         <jackson.version>2.14.2</jackson.version>