From 9c3235ccff2a335b0c52e70ac9a75ab07a455950 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Mon, 7 Jul 2025 11:41:38 -0700 Subject: [PATCH 1/2] fix several build warnings around deprecations --- build.gradle.kts | 2 ++ .../kotlin/otel.android-app-conventions.gradle.kts | 12 ++++++++---- .../otel.android-library-conventions.gradle.kts | 13 ++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) 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..522d2d847 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 jvmTarget = 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(jvmTarget) + 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..f829f29bb 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,4 @@ +import gradle.kotlin.dsl.accessors._d8282334f089ec6fbf714caba2b86dd9.kotlin import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -31,11 +32,13 @@ android { targetCompatibility(javaVersion) } - kotlinOptions { - jvmTarget = javaVersion.toString() - apiVersion = minKotlinVersion.version - languageVersion = minKotlinVersion.version - freeCompilerArgs = listOf("-Xjvm-default=all") + kotlin { + compilerOptions { + jvmTarget.set(jvmTarget) + apiVersion.set(minKotlinVersion) + languageVersion.set(minKotlinVersion) + freeCompilerArgs.set(listOf("-Xjvm-default=all")) + } } } From 6981ec92b74261b024eb4b1015b7a7eb4e8c1d48 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Mon, 7 Jul 2025 11:57:36 -0700 Subject: [PATCH 2/2] rename to eliminate circular dep --- .../src/main/kotlin/otel.android-app-conventions.gradle.kts | 4 ++-- .../main/kotlin/otel.android-library-conventions.gradle.kts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 522d2d847..ca4ff90c7 100644 --- a/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts @@ -8,7 +8,7 @@ plugins { } val javaVersion = rootProject.extra["java_version"] as JavaVersion -val jvmTarget = rootProject.extra["jvm_target"] as JvmTarget +val targetJvm = rootProject.extra["jvm_target"] as JvmTarget val minKotlinVersion = rootProject.extra["kotlin_min_supported_version"] as KotlinVersion android { namespace = "io.opentelemetry.android" @@ -27,7 +27,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(jvmTarget) + jvmTarget.set(targetJvm) apiVersion.set(minKotlinVersion) languageVersion.set(minKotlinVersion) } 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 f829f29bb..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,4 +1,5 @@ import gradle.kotlin.dsl.accessors._d8282334f089ec6fbf714caba2b86dd9.kotlin +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -10,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() @@ -34,7 +36,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(jvmTarget) + jvmTarget.set(targetJvm) apiVersion.set(minKotlinVersion) languageVersion.set(minKotlinVersion) freeCompilerArgs.set(listOf("-Xjvm-default=all"))