Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1884192 - Use jvmToolchain for setting the target JVM version. r=mcarare

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D217824
This commit is contained in:
Ryan VanderMeulen 2024-07-26 15:10:51 +00:00
parent 61b19f1c52
commit 1147ce0681
7 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@ -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)
}
}
}

5
mobile/android/annotations/build.gradle
View File

@ -6,8 +6,3 @@ dependencies {
implementation ComponentsDependencies.tools_lint
implementation ComponentsDependencies.tools_lintchecks
}
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

5
mobile/android/examples/messaging_example/app/build.gradle
View File

@ -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

5
mobile/android/examples/port_messaging_example/app/build.gradle
View File

@ -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

6
mobile/android/geckoview/build.gradle
View File

@ -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 {

6
mobile/android/geckoview_example/build.gradle
View File

@ -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

6
mobile/android/test_runner/build.gradle
View File

@ -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