Bug 1882134 - Use jvmToolchain for setting target JVM version

fenix/125.0
Ryan VanderMeulen 3 months ago committed by mergify[bot]
parent 0c13a2d516
commit 065f7e70fc

@ -219,11 +219,6 @@ android {
} }
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
bundle { bundle {
// Profiler issues require us to temporarily package native code compressed to // Profiler issues require us to temporarily package native code compressed to
// match the previous APK packaging. // match the previous APK packaging.

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

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

@ -5,9 +5,6 @@
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'kotlin' apply plugin: 'kotlin'
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
repositories { repositories {
if (project.hasProperty("centralRepo")) { if (project.hasProperty("centralRepo")) {
maven { maven {

Loading…
Cancel
Save