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

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,

embrace-android-features/src/main/kotlin/io/embrace/android/embracesdk/internal/ui/FirstDrawDetector.kt

@@ -25,7 +25,7 @@
     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 @@
                     decorView.onNextDraw {
                         if (!trackingLoad(instanceId)) {
                             drawBeginCallback()
-                            loadingActivities[instanceId] = firstFrameDeliveredCallback
+                            loadingActivities[instanceId] = Runnable { firstFrameDeliveredCallback() }
                             decorView.viewTreeObserver.registerFrameCommitCallback(firstFrameDeliveredCallback)
                         }
                     }
@@ -57,7 +57,7 @@
                 // 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 { }
             }
         }
     }

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;
-}
+}

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);
     }

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();
     }
-}
+}

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,

embrace-gradle-plugin/src/test/java/io/embrace/android/gradle/plugin/util/GradleVersionTest.kt

@@ -8,7 +8,7 @@ class GradleVersionTest {
 
     @Test
     fun testCompileVersion() {
-        assertEquals("8.12.1", GradleVersion.CURRENT.toString())
+        assertEquals("8.13", GradleVersion.CURRENT.toString())
     }
 
     @Test

embrace-test-common/src/main/kotlin/io/embrace/android/gradle/config/TestMatrix.kt

@@ -45,5 +45,5 @@ sealed class TestMatrix(
      * The maximum version we currently run tests against. Newer versions may work, but are not
      * explicitly tested.
      */
-    object MaxVersion : TestMatrix("8.8.0", "8.12.1", "2.1.10", JdkEnv.JAVA_17)
+    object MaxVersion : TestMatrix("8.9.0", "8.13", "2.1.10", JdkEnv.JAVA_17)
 }

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"

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