From e302635688fb96ed41dad967f0d5bb078073b4ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:28:36 +0000 Subject: [PATCH 1/4] fix(deps): update dependency androidx.core:core-ktx to v1.15.0 --- demo-app/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-app/gradle/libs.versions.toml b/demo-app/gradle/libs.versions.toml index c975e88ad..0ae9b3ecf 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.2" # demo-app -androidx-core-ktx = "androidx.core:core-ktx:1.13.1" +androidx-core-ktx = "androidx.core:core-ktx:1.15.0" androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6" androidx-compose-bom = "androidx.compose:compose-bom:2024.10.00" androidx-activity-compose = "androidx.activity:activity-compose:1.9.3" From 6c9624a7f96b1e7d143ad428e6d16de1e46e4120 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 30 Oct 2024 16:19:22 -0700 Subject: [PATCH 2/4] group updates --- .github/renovate.json5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 3845d49cd..57b834134 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -72,6 +72,12 @@ "^androidx.lifecycle" ], "groupName": "androidx.lifecycle" + }, + { + "matchPackagePatterns": [ + "^androidx.core" + ], + "groupName": "androidx.core" } ] } From 49f8337e516f0cd66fcfb5ffe649bab4c9eef185 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 30 Oct 2024 16:19:38 -0700 Subject: [PATCH 3/4] update androidx-core version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f60179e39..cb7649452 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,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.13.1" +androidx-core = "androidx.core:core:1.15.0" androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.8.6" findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2" byteBuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byteBuddy" } From 3944e078c552318e65f75844b31a09cc6d1c5f2b Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 30 Oct 2024 16:20:03 -0700 Subject: [PATCH 4/4] update to compileSdk=35 (required for new version of androidx.core) --- demo-app/build.gradle.kts | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 1f2f1f20e..34f82c165 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -12,7 +12,7 @@ localProperties.load(FileInputStream(rootProject.file("local.properties"))) android { namespace = "io.opentelemetry.android.demo" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "io.opentelemetry.android.demo" diff --git a/gradle.properties b/gradle.properties index 724d62272..5e8537757 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.minSdk=21 -android.compileSdk=34 +android.compileSdk=35 version=0.9.0 group=io.opentelemetry.android