Skip to content

Fix several build warnings around deprecations #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breedx-splk merged 2 commits into from
Jul 8, 2025
Merged

Fix several build warnings around deprecations #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c3235c
fix several build warnings around deprecations
breedx-splk Jul 7, 2025
6981ec9
rename to eliminate circular dep
breedx-splk Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,6 +19,7 @@ plugins {
}

extra["java_version"] = JavaVersion.VERSION_1_8
extra["jvm_target"] = JvmTarget.JVM_1_8
Copy link
Copy Markdown
Contributor

@LikeTheSalad LikeTheSalad Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we reuse the java_version value?

Copy link
Copy Markdown
Contributor Author

@breedx-splk breedx-splk Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly no, the types don't match.

extra["kotlin_min_supported_version"] = KotlinVersion.KOTLIN_1_8

allprojects {
Expand Down
12 changes: 8 additions & 4 deletions buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
Expand All @@ -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"
Expand All @@ -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 {
Expand Down
15 changes: 10 additions & 5 deletions buildSrc/src/main/kotlin/otel.android-library-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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()
Expand All @@ -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"))
}
}
}

Expand Down