From 87f1f41111410f9ef09868d39074e5523c326ae4 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Fri, 26 Jul 2024 15:10:51 +0000 Subject: [PATCH] Bug 1884192 - Use jvmToolchain for setting the target JVM version. r=mcarare Differential Revision: https://phabricator.services.mozilla.com/D217824 --- build.gradle | 18 ++++++++---------- mobile/android/annotations/build.gradle | 5 ----- .../messaging_example/app/build.gradle | 5 +---- .../port_messaging_example/app/build.gradle | 5 +---- mobile/android/geckoview/build.gradle | 6 ------ mobile/android/geckoview_example/build.gradle | 6 +----- mobile/android/test_runner/build.gradle | 6 +----- 7 files changed, 12 insertions(+), 39 deletions(-) diff --git a/build.gradle b/build.gradle index 3550aa79f8b6..cb0a04a3ab89 100644 --- a/build.gradle +++ b/build.gradle @@ -478,16 +478,14 @@ subprojects { project -> ktlint('0.49.1') } } - } else { - afterEvaluate { - // Set the source and target compatibility for non-GeckoView projects only. - if (it.hasProperty('android')) { - android { - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - } + } + + afterEvaluate { + // Our vendored copy of exoplayer2 hits build failures when targeting Java 17. + // Given our intent to remove it in the near future, just leave it alone here. + if (it.hasProperty('android') && projectName != 'exoplayer2') { + kotlin { + jvmToolchain(config.jvmTargetCompatibility) } } } diff --git a/mobile/android/annotations/build.gradle b/mobile/android/annotations/build.gradle index 135facdda4c5..2f2d9a91e577 100644 --- a/mobile/android/annotations/build.gradle +++ b/mobile/android/annotations/build.gradle @@ -6,8 +6,3 @@ dependencies { implementation ComponentsDependencies.tools_lint implementation ComponentsDependencies.tools_lintchecks } - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} diff --git a/mobile/android/examples/messaging_example/app/build.gradle b/mobile/android/examples/messaging_example/app/build.gradle index 52934be74fc3..2692465e0919 100644 --- a/mobile/android/examples/messaging_example/app/build.gradle +++ b/mobile/android/examples/messaging_example/app/build.gradle @@ -1,6 +1,7 @@ buildDir "${topobjdir}/gradle/build/mobile/android/examples/messaging_example" apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle" @@ -8,10 +9,6 @@ android { buildToolsVersion project.ext.buildToolsVersion compileSdkVersion project.ext.compileSdkVersion - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } defaultConfig { applicationId "org.mozilla.geckoview.example.messaging" targetSdkVersion project.ext.targetSdkVersion diff --git a/mobile/android/examples/port_messaging_example/app/build.gradle b/mobile/android/examples/port_messaging_example/app/build.gradle index 819dc81fce98..8414e301e10a 100644 --- a/mobile/android/examples/port_messaging_example/app/build.gradle +++ b/mobile/android/examples/port_messaging_example/app/build.gradle @@ -1,6 +1,7 @@ buildDir "${topobjdir}/gradle/build/mobile/android/examples/port_messaging_example" apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle" @@ -8,10 +9,6 @@ android { buildToolsVersion project.ext.buildToolsVersion compileSdkVersion project.ext.compileSdkVersion - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } defaultConfig { applicationId "org.mozilla.geckoview.example.messaging" targetSdkVersion project.ext.targetSdkVersion diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle index cdd504999980..8603af91b348 100644 --- a/mobile/android/geckoview/build.gradle +++ b/mobile/android/geckoview/build.gradle @@ -83,11 +83,6 @@ android { project.configureProductFlavors.delegate = it project.configureProductFlavors() - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - lintOptions { abortOnError false } @@ -189,7 +184,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { kotlinOptions { allWarningsAsErrors = true - jvmTarget = JavaVersion.VERSION_17 } doFirst { diff --git a/mobile/android/geckoview_example/build.gradle b/mobile/android/geckoview_example/build.gradle index 56363cecfc66..b96abf39dd7f 100644 --- a/mobile/android/geckoview_example/build.gradle +++ b/mobile/android/geckoview_example/build.gradle @@ -1,6 +1,7 @@ buildDir "${topobjdir}/gradle/build/mobile/android/geckoview_example" apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle" @@ -18,11 +19,6 @@ android { versionName project.ext.versionName } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - buildTypes { release { minifyEnabled false diff --git a/mobile/android/test_runner/build.gradle b/mobile/android/test_runner/build.gradle index 133d0e4ef65d..f55df3b631b3 100644 --- a/mobile/android/test_runner/build.gradle +++ b/mobile/android/test_runner/build.gradle @@ -1,6 +1,7 @@ buildDir "${topobjdir}/gradle/build/mobile/android/test_runner" apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle" @@ -18,11 +19,6 @@ android { versionName project.ext.versionName } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - buildTypes { release { minifyEnabled false