Bug 1882134 - Use jvmToolchain for setting target JVM version

mozilla-mobile · Feb 27, 2024 · bc9140a · bc9140a
1 parent 51ee7db
commit bc9140a
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 55 deletions.
diff --git a/android-components/.config.yml b/android-components/.config.yml
@@ -2,6 +2,7 @@
 componentsGroupId: "org.mozilla.components"
 
 # Synchronized build configuration for all modules
+jvmTargetCompatibility: 17
 compileSdkVersion: 34
 minSdkVersion: 21
 targetSdkVersion: 34
diff --git a/android-components/build.gradle b/android-components/build.gradle
@@ -202,6 +202,10 @@ subprojects {
                 lintChecks project(':tooling-lint')
             }
 
+            kotlin {
+                jvmToolchain(config.jvmTargetCompatibility)
+            }
+
             android {
                 testOptions {
                     unitTests {
@@ -224,13 +228,7 @@ subprojects {
                     ignoreAssetsPattern "manifest.template.json"
                 }
 
-                compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_17
-                    targetCompatibility JavaVersion.VERSION_17
-                }
-
                 tasks.withType(KotlinCompile).configureEach {
-                    kotlinOptions.jvmTarget = "17"
                     kotlinOptions.freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
                 }
             }

diff --git a/android-components/components/tooling/detekt/build.gradle b/android-components/components/tooling/detekt/build.gradle
@@ -5,9 +5,6 @@
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
 
-targetCompatibility = JavaVersion.VERSION_17
-sourceCompatibility = JavaVersion.VERSION_17
-
 dependencies {
     implementation ComponentsDependencies.tools_detekt_api
 

diff --git a/android-components/components/tooling/lint/build.gradle b/android-components/components/tooling/lint/build.gradle
@@ -7,9 +7,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
 
-targetCompatibility = JavaVersion.VERSION_17
-sourceCompatibility = JavaVersion.VERSION_17
-
 dependencies {
   compileOnly ComponentsDependencies.tools_lintapi
   compileOnly ComponentsDependencies.tools_lintchecks
@@ -43,7 +40,3 @@ tasks.register("assembleAndroidTest") {
     // behaves like our others and we do not need to special case it in automation.
   }
 }
-
-tasks.withType(KotlinCompile).configureEach {
-  kotlinOptions.jvmTarget = "17"
-}
diff --git a/fenix/app/build.gradle b/fenix/app/build.gradle
@@ -219,11 +219,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
     bundle {
         // Profiler issues require us to temporarily package native code compressed to
         // match the previous APK packaging.

diff --git a/fenix/benchmark/build.gradle b/fenix/benchmark/build.gradle
@@ -13,15 +13,6 @@ android {
     namespace 'org.mozilla.fenix.benchmark'
     compileSdk config.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     defaultConfig {
         minSdk 23
         targetSdk config.targetSdkVersion

diff --git a/fenix/build.gradle b/fenix/build.gradle
@@ -170,7 +170,6 @@ allprojects {
     }
 
     tasks.withType(KotlinCompile).configureEach {
-        kotlinOptions.jvmTarget = "17"
         kotlinOptions.allWarningsAsErrors = true
         kotlinOptions.freeCompilerArgs += [
             "-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all-compatibility"
@@ -180,13 +179,8 @@ allprojects {
 
 subprojects {
     afterEvaluate {
-        if (it.hasProperty('android')) {
-            android {
-                compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_17
-                    targetCompatibility JavaVersion.VERSION_17
-                }
-            }
+        kotlin {
+            jvmToolchain(config.jvmTargetCompatibility)
         }
     }
 }

diff --git a/fenix/mozilla-lint-rules/build.gradle b/fenix/mozilla-lint-rules/build.gradle
@@ -5,9 +5,6 @@
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
 
-targetCompatibility = JavaVersion.VERSION_17
-sourceCompatibility = JavaVersion.VERSION_17
-
 repositories {
     if (project.hasProperty("centralRepo")) {
         maven {

diff --git a/focus-android/app/build.gradle b/focus-android/app/build.gradle
@@ -37,11 +37,6 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
     lint {
         lintConfig file("lint.xml")
     }
@@ -167,7 +162,6 @@ android {
         }
     }
 
-
     namespace 'org.mozilla.focus'
 }
 
@@ -178,7 +172,6 @@ tasks.withType(KotlinCompile).configureEach {
             "-opt-in=kotlin.RequiresOptIn",
             "-Xjvm-default=all"
     ]
-    kotlinOptions.jvmTarget = '17'
 }
 
 // -------------------------------------------------------------------------------------------------

diff --git a/focus-android/build.gradle b/focus-android/build.gradle
@@ -108,13 +108,8 @@ allprojects {
 
 subprojects {
     afterEvaluate {
-        if (it.hasProperty('android')) {
-            android {
-                compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_17
-                    targetCompatibility JavaVersion.VERSION_17
-                }
-            }
+        kotlin {
+            jvmToolchain(config.jvmTargetCompatibility)
         }
     }
 }

diff --git a/shared-settings.gradle b/shared-settings.gradle
@@ -21,19 +21,22 @@ class Config {
 
     public final String componentsVersion
     public final String componentsGroupId
+    public final Integer jvmTargetCompatibility
     public final Integer compileSdkVersion
     public final Integer minSdkVersion
     public final Integer targetSdkVersion
 
     Config(
             String componentsVersion,
             String componentsGroupId,
+            Integer jvmTargetCompatibility,
             Integer compileSdkVersion,
             Integer minSdkVersion,
             Integer targetSdkVersion
     ) {
         this.componentsVersion = componentsVersion
         this.componentsGroupId = componentsGroupId
+        this.jvmTargetCompatibility = jvmTargetCompatibility
         this.compileSdkVersion = compileSdkVersion
         this.minSdkVersion = minSdkVersion
         this.targetSdkVersion = targetSdkVersion
@@ -102,6 +105,7 @@ gradle.projectsLoaded { ->
     gradle.rootProject.ext.config = new Config(
             version,
             configData.componentsGroupId,
+            configData.jvmTargetCompatibility,
             configData.compileSdkVersion,
             configData.minSdkVersion,
             configData.targetSdkVersion