Upgrade to JDK 17 and Gradle 8.14.3 (targeting Java 11 bytecode) (#284)

Copilot · keesvandieren · web-flow · commit aa14de9c8c76 · 2025-12-29T07:13:39.000+01:00
* Initial plan

* Upgrade to Java 17 and Gradle 8.5

Co-authored-by: keesvandieren &lt;863966+keesvandieren@users.noreply.github.com&gt;

* Remove outdated Java 8 compatibility check

Co-authored-by: keesvandieren &lt;863966+keesvandieren@users.noreply.github.com&gt;

* Update to Gradle 8.14.3 and configure GitHub Actions to use .java-version file

Co-authored-by: keesvandieren &lt;863966+keesvandieren@users.noreply.github.com&gt;

* Update GitHub Actions checkout to v4

Co-authored-by: keesvandieren &lt;863966+keesvandieren@users.noreply.github.com&gt;

* Set targetCompatibility to Java 11 while building with JDK 17

Co-authored-by: keesvandieren &lt;863966+keesvandieren@users.noreply.github.com&gt;

---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: keesvandieren &lt;863966+keesvandieren@users.noreply.github.com&gt;
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -13,11 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK from .java-version
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        distribution: 'temurin'
+        java-version-file: '.java-version'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Setup Android build environment
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -13,11 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK from .java-version
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        distribution: 'temurin'
+        java-version-file: '.java-version'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Setup Android build environment
diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
@@ -13,11 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK from .java-version
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        distribution: 'temurin'
+        java-version-file: '.java-version'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Setup Android build environment
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-11
+17
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 tasks.named('wrapper') {
-    gradleVersion = '7.5.1'
+    gradleVersion = '8.14.3'
     distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
 
@@ -82,7 +82,7 @@ buildscript {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.2.2"
+        classpath "com.android.tools.build:gradle:8.2.0"
         classpath "com.mobidevelop.robovm:robovm-gradle-plugin:${roboVMVersion}"
     }
 }
@@ -106,15 +106,14 @@ allprojects {
     }
 
     tasks.withType(JavaCompile) {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
 
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
+// Java 17+ is required, so Javadoc linting is always available
+allprojects {
+    tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
     }
 }
diff --git a/gdx-pay-android-amazon/build.gradle b/gdx-pay-android-amazon/build.gradle
@@ -1,10 +1,11 @@
 apply plugin: 'com.android.library'
 apply from : '../publish_android.gradle'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 11
+targetCompatibility = 11
 
 android {
+    namespace 'com.badlogic.gdx.pay.android.amazon'
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
 
diff --git a/gdx-pay-android-googlebilling/build.gradle b/gdx-pay-android-googlebilling/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
 apply from : '../publish_android.gradle'
 
 android {
+    namespace 'com.badlogic.gdx.pay.android.googlebilling'
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
 
diff --git a/gdx-pay-android-huawei/build.gradle b/gdx-pay-android-huawei/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
 apply from : '../publish_android.gradle'
 
 android {
+    namespace 'com.badlogic.gdx.pay.android.huawei'
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
 
diff --git a/gdx-pay-client/build.gradle b/gdx-pay-client/build.gradle
@@ -1,8 +1,8 @@
 apply plugin : 'java-library'
 apply from : '../publish_java.gradle'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 11
+targetCompatibility = 11
 
 sourceSets {
     main {
diff --git a/gdx-pay-iosrobovm-apple/build.gradle b/gdx-pay-iosrobovm-apple/build.gradle
@@ -2,8 +2,8 @@ apply plugin : 'java-library'
 apply plugin : 'robovm'
 apply from : '../publish_java.gradle'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 11
+targetCompatibility = 11
 
 
 dependencies {
diff --git a/gdx-pay-server/build.gradle b/gdx-pay-server/build.gradle
@@ -1,8 +1,8 @@
 apply plugin : 'java-library'
 apply from : '../publish_java.gradle'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 11
+targetCompatibility = 11
 
 sourceSets {
     main {
diff --git a/gdx-pay/build.gradle b/gdx-pay/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java-library'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 11
+targetCompatibility = 11
 
 apply from : '../publish_java.gradle'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
 
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`tasks.named('wrapper') {`
`2`		`- gradleVersion = '7.5.1'`
	`2`	`+ gradleVersion = '8.14.3'`
`3`	`3`	`distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"`
`4`	`4`	`}`
`5`	`5`
`@@ -82,7 +82,7 @@ buildscript {`
`82`	`82`	`maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }`
`83`	`83`	`}`
`84`	`84`	`dependencies {`
`85`		`- classpath "com.android.tools.build:gradle:7.2.2"`
	`85`	`+ classpath "com.android.tools.build:gradle:8.2.0"`
`86`	`86`	`classpath "com.mobidevelop.robovm:robovm-gradle-plugin:${roboVMVersion}"`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -106,15 +106,14 @@ allprojects {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`tasks.withType(JavaCompile) {`
`109`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`110`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`109`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`110`	`+ targetCompatibility = JavaVersion.VERSION_11`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`-if (JavaVersion.current().isJava8Compatible()) {`
`115`		`- allprojects {`
`116`		`- tasks.withType(Javadoc) {`
`117`		`- options.addStringOption('Xdoclint:none', '-quiet')`
`118`		`- }`
	`114`	`+// Java 17+ is required, so Javadoc linting is always available`
	`115`	`+allprojects {`
	`116`	`+ tasks.withType(Javadoc) {`
	`117`	`+ options.addStringOption('Xdoclint:none', '-quiet')`
`119`	`118`	`}`
`120`	`119`	`}`