upgrade: override the JVM Target of subprojects so that we don't have…

… to suppress compile errors
DanXi-Dev · Jan 12, 2025 · 2b8e3ad · 2b8e3ad
1 parent d94fbd2
commit 2b8e3ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -14,24 +14,33 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
                 project.plugins.hasPlugin("com.android.library")) {
             project.android.compileSdkVersion = 35
+
+            // override Java version to 23
+            project.android.compileOptions.sourceCompatibility = JavaVersion.VERSION_23
+            project.android.compileOptions.targetCompatibility = JavaVersion.VERSION_23
+
+            // override Kotlin JVM target to 23 too
+            project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+                kotlinOptions {
+                    jvmTarget = "23"
+                }
+            }
+
             if (project.android.namespace == null) {
                 def manifest = new XmlSlurper().parse(file(project.android.sourceSets.main.manifest.srcFile))
                 def packageName = manifest.@package.text()
                 println("Setting ${packageName} as android namespace")
                 project.android.namespace = packageName
             }
-            // override the kotlin language version for each dependencies to 2.0.20
-            if (project.buildscript.configurations.hasProperty("classpath")) {
-                def found = false
-                project.buildscript.configurations.classpath.getDependencies().each { dep ->
-                    if (dep.group == "org.jetbrains.kotlin" && dep.name == "kotlin-gradle-plugin") {
-                        found = true
-                    }
-                }
-                if (found) {
-                    project.buildscript.dependencies.add("classpath", "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
-                }
-            }
+        }
+    }
+}
+
+// override the kotlin language version for each dependencies to 2.1.0
+configurations.all {
+    resolutionStrategy.eachDependency { details ->
+        if (details.requested.group == 'org.jetbrains.kotlin' && details.requested.name == 'kotlin-gradle-plugin') {
+            details.useVersion '2.1.0'
         }
     }
 }

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -3,5 +3,4 @@ android.enableJetifier=true
 org.gradle.jvmargs=-Xmx4096M -XX:MaxNewSize=3G
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configureondemand=false
-kotlin.jvm.target.validation.mode=warning
+org.gradle.configureondemand=false