chore: bump gradle & Java 21 support

triniwiz · triniwiz · commit 9bf0711685e8 · 2024-12-08T20:24:58.000-04:00
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/test-app/build-tools/android-dts-generator b/test-app/build-tools/android-dts-generator
@@ -1 +1 @@
-Subproject commit 888677203a46c99b1ea5139049f9bca4131b9a3e
+Subproject commit f2a672f0a4485877fef1717acfcb53a9b2c33eaf
diff --git a/test-app/build-tools/android-metadata-generator/build.gradle b/test-app/build-tools/android-metadata-generator/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'java'
 apply plugin: 'kotlin'
 
 java {
-    sourceCompatibility = '17'
-    targetCompatibility = '17'
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 // todo: check if still needed
diff --git a/test-app/gradle.properties b/test-app/gradle.properties
@@ -22,7 +22,7 @@ android.useAndroidX=true
 NS_DEFAULT_BUILD_TOOLS_VERSION=35.0.0
 NS_DEFAULT_COMPILE_SDK_VERSION=35
 NS_DEFAULT_MIN_SDK_VERSION=21
-NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.5.0
+NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.7.0
 
 ns_default_androidx_appcompat_version = 1.5.1
 ns_default_androidx_exifinterface_version = 1.3.7
diff --git a/test-app/gradle/wrapper/gradle-wrapper.properties b/test-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Dec 08 19:56:04 AST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test-app/runtime-binding-generator/build.gradle b/test-app/runtime-binding-generator/build.gradle
@@ -7,8 +7,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = '17'
-    targetCompatibility = '17'
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 // Disable compilation tasks as these are compiled *with* the runtime and not separately
diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle
@@ -128,6 +128,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -144,13 +149,13 @@ android {
 }
 
 allprojects {
-    gradle.projectsEvaluated {
+   /* gradle.projectsEvaluated {
         tasks.withType(JavaCompile).tap {
             configureEach {
                 options.compilerArgs << "-Xlint:all" << "-Werror"
             }
         }
-    }
+    }*/
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ apply plugin: 'java'`
`2`	`2`	`apply plugin: 'kotlin'`
`3`	`3`
`4`	`4`	`java {`
`5`		`- sourceCompatibility = '17'`
`6`		`- targetCompatibility = '17'`
	`5`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`6`	`+ targetCompatibility = JavaVersion.VERSION_17`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`// todo: check if still needed`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ dependencies {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`java {`
`10`		`- sourceCompatibility = '17'`
`11`		`- targetCompatibility = '17'`
	`10`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`11`	`+ targetCompatibility = JavaVersion.VERSION_17`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`// Disable compilation tasks as these are compiled with the runtime and not separately`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,11 @@ android {`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
	`131`	`+ compileOptions {`
	`132`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`133`	`+ targetCompatibility JavaVersion.VERSION_17`
	`134`	`+ }`
	`135`	`+`
`131`	`136`	`buildTypes {`
`132`	`137`	`release {`
`133`	`138`	`minifyEnabled false`
`@@ -144,13 +149,13 @@ android {`
`144`	`149`	`}`
`145`	`150`
`146`	`151`	`allprojects {`
`147`		`- gradle.projectsEvaluated {`
	`152`	`+ /* gradle.projectsEvaluated {`
`148`	`153`	`tasks.withType(JavaCompile).tap {`
`149`	`154`	`configureEach {`
`150`	`155`	`options.compilerArgs << "-Xlint:all" << "-Werror"`
`151`	`156`	`}`
`152`	`157`	`}`
`153`		`- }`
	`158`	`+ }*/`
`154`	`159`	`}`
`155`	`160`
`156`	`161`	`dependencies {`