Update AGP to 8.9 and Gradle to 8.13 and fix new issues

bidetofevil · bidetofevil · commit 0fa239c03a80 · 2025-03-06T17:03:15.000-08:00
diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/capture/metadata/EmbraceMetadataService.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/capture/metadata/EmbraceMetadataService.kt
@@ -1,6 +1,5 @@
 package io.embrace.android.embracesdk.internal.capture.metadata
 
-import android.annotation.TargetApi
 import android.app.usage.StorageStatsManager
 import android.content.Context
 import android.content.pm.PackageManager
@@ -9,6 +8,7 @@ import android.os.Environment
 import android.os.Process
 import android.os.StatFs
 import android.os.storage.StorageManager
+import androidx.annotation.RequiresApi
 import io.embrace.android.embracesdk.internal.clock.Clock
 import io.embrace.android.embracesdk.internal.config.ConfigService
 import io.embrace.android.embracesdk.internal.envelope.resource.EnvelopeResourceSource
@@ -69,7 +69,7 @@ internal class EmbraceMetadataService(
     }
 
     @Suppress("DEPRECATION")
-    @TargetApi(Build.VERSION_CODES.O)
+    @RequiresApi(Build.VERSION_CODES.O)
     private fun getDeviceDiskAppUsage(
         storageStatsManager: StorageStatsManager?,
         packageManager: PackageManager,
diff --git a/embrace-android-features/src/main/kotlin/io/embrace/android/embracesdk/internal/ui/FirstDrawDetector.kt b/embrace-android-features/src/main/kotlin/io/embrace/android/embracesdk/internal/ui/FirstDrawDetector.kt
@@ -25,7 +25,7 @@ class FirstDrawDetector(
     private val logger: EmbLogger,
 ) : DrawEventEmitter {
 
-    private val loadingActivities: MutableMap<Int, () -> Unit> = ConcurrentHashMap()
+    private val loadingActivities: MutableMap<Int, Runnable> = ConcurrentHashMap()
 
     override fun registerFirstDrawCallback(
         activity: Activity,
@@ -41,7 +41,7 @@ class FirstDrawDetector(
                     decorView.onNextDraw {
                         if (!trackingLoad(instanceId)) {
                             drawBeginCallback()
-                            loadingActivities[instanceId] = firstFrameDeliveredCallback
+                            loadingActivities[instanceId] = Runnable { firstFrameDeliveredCallback() }
                             decorView.viewTreeObserver.registerFrameCommitCallback(firstFrameDeliveredCallback)
                         }
                     }
@@ -57,7 +57,7 @@ class FirstDrawDetector(
                 // Adding an empty function indicates that the registration has failed and no subsequent attempts should
                 // be made for this instance. This prevents over-logging of errors for the same instance if the callback
                 // the window is null, should that ever happen.
-                loadingActivities[instanceId] = { }
+                loadingActivities[instanceId] = Runnable { }
             }
         }
     }
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnection.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnection.java
@@ -1,9 +1,8 @@
 package io.embrace.android.embracesdk.internal.network.http;
 
-import android.annotation.TargetApi;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,7 +49,7 @@ interface EmbraceHttpUrlConnection {
 
     int getContentLength();
 
-    @TargetApi(24)
+    @RequiresApi(24)
     long getContentLengthLong();
 
     @Nullable
@@ -86,7 +85,7 @@ interface EmbraceHttpUrlConnection {
     @Nullable
     String getHeaderFieldKey(int n);
 
-    @TargetApi(24)
+    @RequiresApi(24)
     long getHeaderFieldLong(@NonNull String name, long defaultValue);
 
     @Nullable
@@ -156,4 +155,4 @@ interface EmbraceHttpUrlConnection {
 
     @Nullable
     Principal getPeerPrincipal() throws SSLPeerUnverifiedException;
-}
+}
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionImpl.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionImpl.java
@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.network.http;
 
-import android.annotation.TargetApi;
+import androidx.annotation.RequiresApi;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -90,7 +90,7 @@ public int getContentLength() {
     }
 
     @Override
-    @TargetApi(24)
+    @RequiresApi(24)
     public long getContentLengthLong() {
         return embraceHttpUrlConnectionDelegate.getContentLengthLong();
     }
@@ -166,7 +166,7 @@ public String getHeaderFieldKey(int n) {
     }
 
     @Override
-    @TargetApi(24)
+    @RequiresApi(24)
     public long getHeaderFieldLong(String name, long defaultValue) {
         return embraceHttpUrlConnectionDelegate.getHeaderFieldLong(name, defaultValue);
     }
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnectionImpl.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnectionImpl.java
@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.network.http;
 
-import android.annotation.TargetApi;
+import androidx.annotation.RequiresApi;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -100,7 +100,7 @@ public int getContentLength() {
     }
 
     @Override
-    @TargetApi(24)
+    @RequiresApi(24)
     public long getContentLengthLong() {
         return this.embraceHttpsUrlConnectionDelegate.getContentLengthLong();
     }
@@ -176,7 +176,7 @@ public String getHeaderFieldKey(int n) {
     }
 
     @Override
-    @TargetApi(24)
+    @RequiresApi(24)
     public long getHeaderFieldLong(String name, long defaultValue) {
         return this.embraceHttpsUrlConnectionDelegate.getHeaderFieldLong(name, defaultValue);
     }
@@ -355,4 +355,4 @@ public Principal getLocalPrincipal() {
     public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
         return embraceHttpsUrlConnectionDelegate.getPeerPrincipal();
     }
-}
+}
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java
@@ -3,11 +3,9 @@
 import static io.embrace.android.embracesdk.internal.EmbraceInternalApi.CUSTOM_TRACE_ID_HEADER_NAME;
 import static io.embrace.android.embracesdk.internal.config.behavior.NetworkSpanForwardingBehaviorImpl.TRACEPARENT_HEADER_NAME;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -225,7 +223,7 @@ public int getContentLength() {
     }
 
     @Override
-    @TargetApi(24)
+    @RequiresApi(24)
     public long getContentLengthLong() {
         return shouldUncompressGzip() ?
             -1 : this.connection.getContentLengthLong();
@@ -334,7 +332,7 @@ public int getHeaderFieldInt(@NonNull String name, int defaultValue) {
 
 
     @Override
-    @TargetApi(24)
+    @RequiresApi(24)
     public long getHeaderFieldLong(@NonNull String name, long defaultValue) {
         Long result = retrieveHeaderField(name,
             defaultValue,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 
 # Some dependencies are pinned to old versions because of an unpatched AGP issue in 7.x: https://issuetracker.google.com/issues/377760847
 binaryCompatibilityValidator = "0.17.0"
-agp = "8.8.2"
+agp = "8.9.0"
 junit = "4.13.2"
 kotlinExposed = "1.8.22"
 dokka = "1.9.20"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Thu Mar 06 16:43:27 PST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class FirstDrawDetector(`
`25`	`25`	`private val logger: EmbLogger,`
`26`	`26`	`) : DrawEventEmitter {`
`27`	`27`
`28`		`- private val loadingActivities: MutableMap<Int, () -> Unit> = ConcurrentHashMap()`
	`28`	`+ private val loadingActivities: MutableMap<Int, Runnable> = ConcurrentHashMap()`
`29`	`29`
`30`	`30`	`override fun registerFirstDrawCallback(`
`31`	`31`	`activity: Activity,`
`@@ -41,7 +41,7 @@ class FirstDrawDetector(`
`41`	`41`	`decorView.onNextDraw {`
`42`	`42`	`if (!trackingLoad(instanceId)) {`
`43`	`43`	`drawBeginCallback()`
`44`		`- loadingActivities[instanceId] = firstFrameDeliveredCallback`
	`44`	`+ loadingActivities[instanceId] = Runnable { firstFrameDeliveredCallback() }`
`45`	`45`	`decorView.viewTreeObserver.registerFrameCommitCallback(firstFrameDeliveredCallback)`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -57,7 +57,7 @@ class FirstDrawDetector(`
`57`	`57`	`// Adding an empty function indicates that the registration has failed and no subsequent attempts should`
`58`	`58`	`// be made for this instance. This prevents over-logging of errors for the same instance if the callback`
`59`	`59`	`// the window is null, should that ever happen.`
`60`		`- loadingActivities[instanceId] = { }`
	`60`	`+ loadingActivities[instanceId] = Runnable { }`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package io.embrace.android.embracesdk.internal.network.http;`
`2`	`2`
`3`		`-import android.annotation.TargetApi;`
	`3`	`+import androidx.annotation.RequiresApi;`
`4`	`4`
`5`	`5`	`import java.io.IOException;`
`6`	`6`	`import java.io.InputStream;`
`@@ -90,7 +90,7 @@ public int getContentLength() {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@Override`
`93`		`- @TargetApi(24)`
	`93`	`+ @RequiresApi(24)`
`94`	`94`	`public long getContentLengthLong() {`
`95`	`95`	`return embraceHttpUrlConnectionDelegate.getContentLengthLong();`
`96`	`96`	`}`
`@@ -166,7 +166,7 @@ public String getHeaderFieldKey(int n) {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`@Override`
`169`		`- @TargetApi(24)`
	`169`	`+ @RequiresApi(24)`
`170`	`170`	`public long getHeaderFieldLong(String name, long defaultValue) {`
`171`	`171`	`return embraceHttpUrlConnectionDelegate.getHeaderFieldLong(name, defaultValue);`
`172`	`172`	`}`