From 9eb6981cb105747773e72e979a38714db83f0499 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 12:10:17 +0000 Subject: [PATCH 1/4] chore(deps): update dependency gradle to v9 --- demo-app/gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demo-app/gradle/wrapper/gradle-wrapper.properties b/demo-app/gradle/wrapper/gradle-wrapper.properties index 78cb6e16a..3e781fbad 100644 --- a/demo-app/gradle/wrapper/gradle-wrapper.properties +++ b/demo-app/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78cb6e16a..1a988f61c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 16acf5c7d116425e5a8299a3cccca9a75ce2879a Mon Sep 17 00:00:00 2001 From: jason plumb <75337021+breedx-splk@users.noreply.github.com> Date: Wed, 6 Aug 2025 09:10:38 -0700 Subject: [PATCH 2/4] Update gradle/wrapper/gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1a988f61c..3e781fbad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 +distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true From a3852ec3306a2ad8bf292443ec35826f027bfe79 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 6 Aug 2025 09:43:16 -0700 Subject: [PATCH 3/4] build fixes --- animal-sniffer-signature/build.gradle.kts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/animal-sniffer-signature/build.gradle.kts b/animal-sniffer-signature/build.gradle.kts index f7aa8a158..e526d414c 100644 --- a/animal-sniffer-signature/build.gradle.kts +++ b/animal-sniffer-signature/build.gradle.kts @@ -24,14 +24,11 @@ val signatureJarClasspath = isCanBeResolved = true extendsFrom(signatureJar) } -val generatedSignature = - configurations.create("generatedSignature") { - isCanBeConsumed = true - isCanBeResolved = false - } -configurations.add(signatureJar) -configurations.add(signatureJarClasspath) -configurations.add(generatedSignature) + +configurations.create("generatedSignature") { + isCanBeConsumed = true + isCanBeResolved = false +} dependencies { signature("com.toasttab.android:gummy-bears-api-${project.property("android.minSdk")}:0.9.0@signature") From 77400de2c59a28a1b61681a74d734de75fb5a47e Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 6 Aug 2025 10:02:17 -0700 Subject: [PATCH 4/4] fix services after rebase --- services/api/services.api | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/api/services.api b/services/api/services.api index ee4a07fd8..cd09a1546 100644 --- a/services/api/services.api +++ b/services/api/services.api @@ -62,10 +62,6 @@ public final class io/opentelemetry/android/internal/services/network/detector/N public final fun create (Landroid/content/Context;)Lio/opentelemetry/android/internal/services/network/detector/NetworkDetector; } -public final class io/opentelemetry/android/internal/services/network/detector/PostApi28NetworkDetectorKt { - public static final fun canReadPhoneState (Landroid/content/Context;)Z -} - public abstract class io/opentelemetry/android/internal/services/periodicwork/PeriodicRunnable : java/lang/Runnable { public fun (Lkotlin/jvm/functions/Function0;)V public abstract fun minimumDelayUntilNextRunInMillis ()J