diff --git a/build.gradle.kts b/build.gradle.kts index 76b917e49..a3f3d1124 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion // Top-level build file where you can add configuration options common to all sub-projects/modules. @@ -18,6 +19,7 @@ plugins { } extra["java_version"] = JavaVersion.VERSION_1_8 +extra["jvm_target"] = JvmTarget.JVM_1_8 extra["kotlin_min_supported_version"] = KotlinVersion.KOTLIN_1_8 allprojects { diff --git a/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts index d6656b200..ca4ff90c7 100644 --- a/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -7,6 +8,7 @@ plugins { } val javaVersion = rootProject.extra["java_version"] as JavaVersion +val targetJvm = rootProject.extra["jvm_target"] as JvmTarget val minKotlinVersion = rootProject.extra["kotlin_min_supported_version"] as KotlinVersion android { namespace = "io.opentelemetry.android" @@ -23,10 +25,12 @@ android { isCoreLibraryDesugaringEnabled = true } - kotlinOptions { - jvmTarget = javaVersion.toString() - apiVersion = minKotlinVersion.version - languageVersion = minKotlinVersion.version + kotlin { + compilerOptions { + jvmTarget.set(targetJvm) + apiVersion.set(minKotlinVersion) + languageVersion.set(minKotlinVersion) + } } packaging { diff --git a/buildSrc/src/main/kotlin/otel.android-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.android-library-conventions.gradle.kts index 92077949e..d9cf6bf6f 100644 --- a/buildSrc/src/main/kotlin/otel.android-library-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.android-library-conventions.gradle.kts @@ -1,3 +1,5 @@ +import gradle.kotlin.dsl.accessors._d8282334f089ec6fbf714caba2b86dd9.kotlin +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -9,6 +11,7 @@ plugins { } val javaVersion = rootProject.extra["java_version"] as JavaVersion +val targetJvm = rootProject.extra["jvm_target"] as JvmTarget val minKotlinVersion = rootProject.extra["kotlin_min_supported_version"] as KotlinVersion android { compileSdk = (property("android.compileSdk") as String).toInt() @@ -31,11 +34,13 @@ android { targetCompatibility(javaVersion) } - kotlinOptions { - jvmTarget = javaVersion.toString() - apiVersion = minKotlinVersion.version - languageVersion = minKotlinVersion.version - freeCompilerArgs = listOf("-Xjvm-default=all") + kotlin { + compilerOptions { + jvmTarget.set(targetJvm) + apiVersion.set(minKotlinVersion) + languageVersion.set(minKotlinVersion) + freeCompilerArgs.set(listOf("-Xjvm-default=all")) + } } }