Skip to content

Commit 3fb17ef

Browse files
fix(deps): update androidx.core to v1.16.0 (#933)
* fix(deps): update androidx.core to v1.16.0 * fix build * add another packaging exclude --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <jplumb@splunk.com>
1 parent 91e1103 commit 3fb17ef

4 files changed

Lines changed: 10 additions & 2 deletions

File tree

buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ android {
2828
apiVersion = minKotlinVersion.version
2929
languageVersion = minKotlinVersion.version
3030
}
31+
32+
packaging {
33+
resources.excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
34+
}
3135
}
3236

3337
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")

demo-app/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", vers
2222
desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.5"
2323

2424
# demo-app
25-
androidx-core-ktx = "androidx.core:core-ktx:1.15.0"
25+
androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
2626
androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
2727
androidx-compose-bom = "androidx.compose:compose-bom:2025.04.00"
2828
androidx-activity-compose = "androidx.activity:activity-compose:1.10.1"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ autoService = "1.1.1"
1818
opentelemetry-platform-alpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetry-instrumentation-alpha" }
1919
opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" }
2020
androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7"
21-
androidx-core = "androidx.core:core:1.15.0"
21+
androidx-core = "androidx.core:core:1.16.0"
2222
androidx-annotation = "androidx.annotation:annotation:1.9.1"
2323
androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.8.7"
2424
androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1"

test-common/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ description = "OpenTelemetry Android common test utils"
66

77
android {
88
namespace = "io.opentelemetry.android.test.common"
9+
10+
packaging {
11+
resources.excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
12+
}
913
}
1014

1115
dependencies {

0 commit comments

Comments
 (0)