Upgrade Gradle version to 8.11 and AGP version to 8.7.3 (#214)

google · Dec 17, 2024 · c137bcf · c137bcf
1 parent bb800d7
commit c137bcf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here.
     }
@@ -50,12 +50,13 @@ android {
         warningsAsErrors true
         disable 'HardwareIds','MissingApplicationIcon','GoogleAppIndexingWarning','InvalidPackage','OldTargetApi'
     }
+    namespace 'com.google.android.mobly.snippet.bundled'
 }
 
 // Produces a jar of source files. Needed for compliance reasons.
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'src'
+    archiveClassifier.set('src')
 }
 
 task javadoc(type: Javadoc) {

diff --git a/gradle.properties b/gradle.properties
@@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
 android.enableD8.desugaring=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 14 02:01:02 CST 2021
+#Mon Dec 16 18:55:43 PST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.mobly.snippet.bundled">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.telephony" android:required="false" />
 

diff --git a/src/test/java/UtilsTest.java b/src/test/java/UtilsTest.java
@@ -56,7 +56,7 @@ public void testInvokeByReflection_Obj() throws Throwable {
         List<?> sampleList = Collections.singletonList("sampleList");
         ReflectionTest_HostClass hostClass = new ReflectionTest_HostClass();
         Object ret = invokeByReflection(hostClass, "returnSame", sampleList);
-        Truth.assertThat(ret).isSameAs(sampleList);
+        Truth.assertThat(ret).isEqualTo(sampleList);
     }
 
     @Test
@@ -87,11 +87,11 @@ public void testInvokeByReflection_MultiArg() throws Throwable {
         Object arg2 = new Object();
         Object ret =
                 invokeByReflection(hostClass, "multiArgCall", arg1, arg2, true /* returnArg1 */);
-        Truth.assertThat(ret).isSameAs(arg1);
+        Truth.assertThat(ret).isEqualTo(arg1);
         ret =
                 Utils.invokeByReflection(
                         hostClass, "multiArgCall", arg1, arg2, false /* returnArg1 */);
-        Truth.assertThat(ret).isSameAs(arg2);
+        Truth.assertThat(ret).isEqualTo(arg2);
     }
 
     @Test