From b6f661dbf6cb246281dd8ba2b01b659e2edfa321 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 19:28:36 +0000
Subject: [PATCH 1/3] fix(deps): update androidx.core to v1.16.0

---
 demo-app/gradle/libs.versions.toml | 2 +-
 gradle/libs.versions.toml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo-app/gradle/libs.versions.toml b/demo-app/gradle/libs.versions.toml
index 61ed3f00c..fbf01d4d5 100644
--- a/demo-app/gradle/libs.versions.toml
+++ b/demo-app/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", vers
 desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.5"
 
 # demo-app
-androidx-core-ktx = "androidx.core:core-ktx:1.15.0"
+androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
 androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
 androidx-compose-bom = "androidx.compose:compose-bom:2025.03.01"
 androidx-activity-compose = "androidx.activity:activity-compose:1.10.1"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 46bf3d1f7..d3d071451 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ autoService = "1.1.1"
 opentelemetry-platform-alpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetry-instrumentation-alpha" }
 opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" }
 androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7"
-androidx-core = "androidx.core:core:1.15.0"
+androidx-core = "androidx.core:core:1.16.0"
 androidx-annotation = "androidx.annotation:annotation:1.9.1"
 androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.8.7"
 androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1"

From 52a0f367b040fc831f4425b80455dbf5f0254797 Mon Sep 17 00:00:00 2001
From: Jason Plumb <jplumb@splunk.com>
Date: Fri, 11 Apr 2025 14:11:58 -0700
Subject: [PATCH 2/3] fix build

---
 .../src/main/kotlin/otel.android-app-conventions.gradle.kts   | 4 ++++
 1 file changed, 4 insertions(+)

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 b84086070..d6656b200 100644
--- a/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.android-app-conventions.gradle.kts
@@ -28,6 +28,10 @@ android {
         apiVersion = minKotlinVersion.version
         languageVersion = minKotlinVersion.version
     }
+
+    packaging {
+        resources.excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
+    }
 }
 
 val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")

From 11edfd8c97013107c5146b555d729680b5f5752f Mon Sep 17 00:00:00 2001
From: Jason Plumb <jplumb@splunk.com>
Date: Fri, 11 Apr 2025 14:33:07 -0700
Subject: [PATCH 3/3] add another packaging exclude

---
 test-common/build.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test-common/build.gradle.kts b/test-common/build.gradle.kts
index 3885db477..c19e684cb 100644
--- a/test-common/build.gradle.kts
+++ b/test-common/build.gradle.kts
@@ -6,6 +6,10 @@ description = "OpenTelemetry Android common test utils"
 
 android {
     namespace = "io.opentelemetry.android.test.common"
+
+    packaging {
+        resources.excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF"
+    }
 }
 
 dependencies {