Merge remote-tracking branch 'origin/main' into move-android-instrumented-test

Author: SimonMarquis

.github/workflows/Build.yaml

@@ -45,13 +45,40 @@ jobs:
       - name: Check spotless
         run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
 
+      - name: Check Dependency Guard
+        id: dependencyguard_verify
+        continue-on-error: true
+        run: ./gradlew dependencyGuard
+
+      - name: Prevent updating Dependency Guard baselines if this is a fork
+        id: checkfork_dependencyguard
+        continue-on-error: false
+        if: steps.dependencyguard_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
+        run: |
+          echo "::error::Dependency Guard failed, please update baselines with: ./gradlew dependencyGuardBaseline" && exit 1
+
+        # Runs if previous job failed
+      - name: Generate new Dependency Guard baselines if verification failed and it's a PR
+        id: dependencyguard_baseline
+        if: steps.dependencyguard_verify.outcome == 'failure' && github.event_name == 'pull_request'
+        run: |
+          ./gradlew dependencyGuardBaseline
+
+      - name: Push new Dependency Guard baselines if available
+        uses: stefanzweifel/git-auto-commit-action@v5
+        if: steps.dependencyguard_baseline.outcome == 'success'
+        with:
+          file_pattern: '**/dependencies/*.txt'
+          disable_globbing: true
+          commit_message: "🤖 Updates baselines for Dependency Guard"
+
       - name: Run all local screenshot tests (Roborazzi)
         id: screenshotsverify
         continue-on-error: true
         run: ./gradlew verifyRoborazziDemoDebug
 
       - name: Prevent pushing new screenshots if this is a fork
-        id: checkfork
+        id: checkfork_screenshots
         continue-on-error: false
         if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
         run: |
@@ -82,13 +109,9 @@ jobs:
       - name: Build all build type and flavor permutations
         run: ./gradlew :app:assemble :benchmarks:assemble
           -x pixel6Api33ProdNonMinifiedReleaseAndroidTest
-          -x pixel6Api33ProdNonMinifiedBenchmarkAndroidTest
           -x pixel6Api33DemoNonMinifiedReleaseAndroidTest
-          -x pixel6Api33DemoNonMinifiedBenchmarkAndroidTest
           -x collectDemoNonMinifiedReleaseBaselineProfile
-          -x collectDemoNonMinifiedBenchmarkBaselineProfile
           -x collectProdNonMinifiedReleaseBaselineProfile
-          -x collectProdNonMinifiedBenchmarkBaselineProfile
 
       - name: Upload build outputs (APKs)
         uses: actions/upload-artifact@v4
@@ -117,13 +140,31 @@ jobs:
         run: ./gradlew :app:checkProdReleaseBadging
 
   androidTest:
-    runs-on: macOS-latest # enables hardware acceleration in the virtual machine
+    runs-on: ubuntu-latest
     timeout-minutes: 55
     strategy:
       matrix:
         api-level: [26, 30]
 
     steps:
+      - name: Delete unnecessary tools 🔧
+        uses: jlumbroso/[email protected]
+        with:
+          android: false # Don't remove Android tools
+          tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
+          dotnet: true # rm -rf /usr/share/dotnet
+          haskell: true # rm -rf /opt/ghc...
+          swap-storage: true # rm -f /mnt/swapfile (4GiB)
+          docker-images: false # Takes 16s, enable if needed in the future
+          large-packages: false # includes google-cloud-sdk and it's slow
+
+      - 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: Checkout
         uses: actions/checkout@v4
 

.github/workflows/Release.yml

@@ -7,10 +7,17 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 120
 
     steps:
+      - 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: Checkout
         uses: actions/checkout@v4   
 

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -70,7 +70,8 @@ androidx.profileinstaller:profileinstaller:1.3.1
 androidx.savedstate:savedstate-ktx:1.2.1
 androidx.savedstate:savedstate:1.2.1
 androidx.startup:startup-runtime:1.1.1
-androidx.tracing:tracing:1.0.0
+androidx.tracing:tracing-ktx:1.3.0-alpha02
+androidx.tracing:tracing:1.3.0-alpha02
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1

app/build.gradle.kts

@@ -57,17 +57,6 @@ android {
             // Ensure Baseline Profile is fresh for release builds.
             baselineProfile.automaticGenerationDuringBuild = true
         }
-        create("benchmark") {
-            // Enable all the optimizations from release build through initWith(release).
-            initWith(release)
-            matchingFallbacks.add("release")
-            // Debug key signing is available to everyone.
-            signingConfig = signingConfigs.getByName("debug")
-            // Only use benchmark proguard rules
-            proguardFiles("benchmark-rules.pro")
-            isMinifyEnabled = true
-            applicationIdSuffix = NiaBuildType.BENCHMARK.applicationIdSuffix
-        }
     }
 
     packaging {

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -71,19 +71,20 @@ androidx.hilt:hilt-navigation:1.0.0
 androidx.hilt:hilt-work:1.1.0
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.6.2
-androidx.lifecycle:lifecycle-common:2.6.2
-androidx.lifecycle:lifecycle-livedata-core:2.6.2
-androidx.lifecycle:lifecycle-livedata:2.6.2
-androidx.lifecycle:lifecycle-process:2.6.2
-androidx.lifecycle:lifecycle-runtime-compose:2.6.2
-androidx.lifecycle:lifecycle-runtime-ktx:2.6.2
-androidx.lifecycle:lifecycle-runtime:2.6.2
-androidx.lifecycle:lifecycle-service:2.6.2
-androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2
-androidx.lifecycle:lifecycle-viewmodel:2.6.2
+androidx.lifecycle:lifecycle-common-java8:2.7.0
+androidx.lifecycle:lifecycle-common:2.7.0
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
+androidx.lifecycle:lifecycle-livedata-core:2.7.0
+androidx.lifecycle:lifecycle-livedata:2.7.0
+androidx.lifecycle:lifecycle-process:2.7.0
+androidx.lifecycle:lifecycle-runtime-compose:2.7.0
+androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
+androidx.lifecycle:lifecycle-runtime:2.7.0
+androidx.lifecycle:lifecycle-service:2.7.0
+androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
+androidx.lifecycle:lifecycle-viewmodel:2.7.0
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.metrics:metrics-performance:1.0.0-alpha04
@@ -105,15 +106,15 @@ androidx.savedstate:savedstate:1.2.1
 androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
 androidx.startup:startup-runtime:1.1.1
-androidx.tracing:tracing-ktx:1.1.0
-androidx.tracing:tracing:1.1.0
+androidx.tracing:tracing-ktx:1.3.0-alpha02
+androidx.tracing:tracing:1.3.0-alpha02
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 androidx.window:window:1.0.0
-androidx.work:work-runtime-ktx:2.9.0-rc01
-androidx.work:work-runtime:2.9.0-rc01
+androidx.work:work-runtime-ktx:2.9.0
+androidx.work:work-runtime:2.9.0
 com.caverock:androidsvg-aar:1.4
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.accompanist:accompanist-permissions:0.32.0
@@ -168,8 +169,8 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.1-android
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.protobuf:protobuf-javalite:3.24.4
-com.google.protobuf:protobuf-kotlin-lite:3.24.4
+com.google.protobuf:protobuf-javalite:3.25.2
+com.google.protobuf:protobuf-kotlin-lite:3.25.2
 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0
 com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

@@ -90,7 +90,7 @@ class NavigationTest {
     lateinit var topicsRepository: TopicsRepository
 
     private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) =
-        ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }
+        ReadOnlyProperty<Any, String> { _, _ -> activity.getString(resId) }
 
     // The strings used for matching in these tests
     private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_navigate_up)

app/src/main/java/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.util
+
+import android.util.Log
+import androidx.profileinstaller.ProfileVerifier
+import com.google.samples.apps.nowinandroid.core.network.di.ApplicationScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.guava.await
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier].
+ *
+ * When delivering through Google Play, the baseline profile is compiled during installation.
+ * In this case you will see the correct state logged without any further action necessary.
+ * To verify baseline profile installation locally, you need to manually trigger baseline
+ * profile installation.
+ *
+ * For immediate compilation, call:
+ * ```bash
+ * adb shell cmd package compile -f -m speed-profile com.example.macrobenchmark.target
+ * ```
+ * You can also trigger background optimizations:
+ * ```bash
+ * adb shell pm bg-dexopt-job
+ * ```
+ * Both jobs run asynchronously and might take some time complete.
+ *
+ * To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`.
+ * If you don't do either of these steps, you might only see the profile status reported as
+ * "enqueued for compilation" when running the sample locally.
+ *
+ * @see androidx.profileinstaller.ProfileVerifier.CompilationStatus.ResultCode
+ */
+class ProfileVerifierLogger @Inject constructor(
+    @ApplicationScope private val scope: CoroutineScope,
+) {
+    companion object {
+        private const val TAG = "ProfileInstaller"
+    }
+
+    operator fun invoke() = scope.launch {
+        val status = ProfileVerifier.getCompilationStatusAsync().await()
+        Log.d(TAG, "Status code: ${status.profileInstallResultCode}")
+        Log.d(
+            TAG,
+            when {
+                status.isCompiledWithProfile -> "App compiled with profile"
+                status.hasProfileEnqueuedForCompilation() -> "Profile enqueued for compilation"
+                else -> "Profile not compiled nor enqueued"
+            },
+        )
+    }
+}

app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt

@@ -17,7 +17,6 @@
 package com.google.samples.apps.nowinandroid
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
@@ -37,7 +36,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.metrics.performance.JankStats
-import androidx.profileinstaller.ProfileVerifier
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Success
 import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper
@@ -49,12 +47,9 @@ import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
 import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
 import com.google.samples.apps.nowinandroid.ui.NiaApp
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 private const val TAG = "MainActivity"
@@ -90,9 +85,7 @@ class MainActivity : ComponentActivity() {
         lifecycleScope.launch {
             lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.uiState
-                    .onEach {
-                        uiState = it
-                    }
+                    .onEach { uiState = it }
                     .collect()
             }
         }
@@ -152,48 +145,12 @@ class MainActivity : ComponentActivity() {
     override fun onResume() {
         super.onResume()
         lazyStats.get().isTrackingEnabled = true
-        lifecycleScope.launch {
-            logCompilationStatus()
-        }
     }
 
     override fun onPause() {
         super.onPause()
         lazyStats.get().isTrackingEnabled = false
     }
-
-    /**
-     * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier].
-     */
-    private suspend fun logCompilationStatus() {
-        /*
-        When delivering through Google Play, the baseline profile is compiled during installation.
-        In this case you will see the correct state logged without any further action necessary.
-        To verify baseline profile installation locally, you need to manually trigger baseline
-        profile installation.
-        For immediate compilation, call:
-         `adb shell cmd package compile -f -m speed-profile com.example.macrobenchmark.target`
-        You can also trigger background optimizations:
-         `adb shell pm bg-dexopt-job`
-        Both jobs run asynchronously and might take some time complete.
-        To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`.
-        If you don't do either of these steps, you might only see the profile status reported as
-        "enqueued for compilation" when running the sample locally.
-         */
-        withContext(Dispatchers.IO) {
-            val status = ProfileVerifier.getCompilationStatusAsync().await()
-            Log.d(TAG, "ProfileInstaller status code: ${status.profileInstallResultCode}")
-            Log.d(
-                TAG,
-                when {
-                    status.isCompiledWithProfile -> "ProfileInstaller: is compiled with profile"
-                    status.hasProfileEnqueuedForCompilation() ->
-                        "ProfileInstaller: Enqueued for compilation"
-                    else -> "Profile not compiled or enqueued"
-                },
-            )
-        }
-    }
 }
 
 /**

app/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaApplication.kt

@@ -20,22 +20,26 @@ import android.app.Application
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.google.samples.apps.nowinandroid.sync.initializers.Sync
+import com.google.samples.apps.nowinandroid.util.ProfileVerifierLogger
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
-import javax.inject.Provider
 
 /**
  * [Application] class for NiA
  */
 @HiltAndroidApp
 class NiaApplication : Application(), ImageLoaderFactory {
     @Inject
-    lateinit var imageLoader: Provider<ImageLoader>
+    lateinit var imageLoader: dagger.Lazy<ImageLoader>
+
+    @Inject
+    lateinit var profileVerifierLogger: ProfileVerifierLogger
 
     override fun onCreate() {
         super.onCreate()
         // Initialize Sync; the system responsible for keeping data in the app up to date.
         Sync.initialize(context = this)
+        profileVerifierLogger()
     }
 
     override fun newImageLoader(): ImageLoader = imageLoader.get()