Merge branch 'android-remote-main' into api-21

Change-Id: Idac609c7773a83fe1ab2b37d7976a099e390ace9

.github/renovate.json

@@ -5,5 +5,8 @@
   ],
   "baseBranches": [
     "main"
+  ],
+  "gitIgnoredAuthors": [
+    "41898282+github-actions[bot]@users.noreply.github.com"
   ]
-}
+}

.github/workflows/Build.yaml

@@ -26,13 +26,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
@@ -45,12 +38,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
-      - name: Accept licenses
-        run: yes | sdkmanager --licenses || true
-
       - name: Check build-logic
         run: ./gradlew check -p build-logic
 

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt

@@ -67,7 +67,7 @@ internal fun Project.configureAndroidCompose(
             .relativeToRootProject("compose-reports")
             .let(reportsDestination::set)
 
-        stabilityConfigurationFile =
-            isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")
+        stabilityConfigurationFiles
+            .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf"))
     }
 }

core/data/build.gradle.kts

@@ -25,7 +25,6 @@ android {
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
-            isReturnDefaultValues = true
         }
     }
 }

core/datastore/build.gradle.kts

@@ -25,11 +25,6 @@ android {
         consumerProguardFiles("consumer-proguard-rules.pro")
     }
     namespace = "com.google.samples.apps.nowinandroid.core.datastore"
-    testOptions {
-        unitTests {
-            isReturnDefaultValues = true
-        }
-    }
 }
 
 dependencies {

gradle.properties

@@ -58,3 +58,7 @@ android.defaults.buildfeatures.shaders=false
 
 # Run Roborazzi screenshot tests with the local tests
 roborazzi.test.verify=true
+
+# Prevent uninstall app after instrumented tests
+# https://issuetracker.google.com/issues/295039976
+android.injected.androidTest.leaveApksInstalledAfterRun=true