From 065f7e70fc66f51faf5777ed6913540e8459f545 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Fri, 23 Feb 2024 14:18:38 -0500
Subject: [PATCH] Bug 1882134 - Use jvmToolchain for setting target JVM version

---
 app/build.gradle                |  5 -----
 benchmark/build.gradle          |  9 ---------
 build.gradle                    | 10 ++--------
 mozilla-lint-rules/build.gradle |  3 ---
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 44a84cfff..ea48e5ac4 100644
--- a/app/build.gradle
+++ b/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/benchmark/build.gradle b/benchmark/build.gradle
index 20825ec4e..8f13686ff 100644
--- a/benchmark/build.gradle
+++ b/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/build.gradle b/build.gradle
index bd002d017..53718ef05 100644
--- a/build.gradle
+++ b/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/mozilla-lint-rules/build.gradle b/mozilla-lint-rules/build.gradle
index 00fcdb7d3..70c330727 100644
--- a/mozilla-lint-rules/build.gradle
+++ b/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 {