From 23d8eaba014eee2bd3fd17a2bf299bd3b74f137d Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Thu, 16 May 2024 15:19:04 +0900 Subject: [PATCH 1/8] Remove `isReturnDefaultValues`. Change-Id: I028244a23b6215e21269602b8df07e58b136b9f1 --- core/data/build.gradle.kts | 1 - core/datastore/build.gradle.kts | 5 ----- 2 files changed, 6 deletions(-) diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 142637ff9..f448e88c6 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -25,7 +25,6 @@ android { testOptions { unitTests { isIncludeAndroidResources = true - isReturnDefaultValues = true } } } diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts index 34ea5ee78..04a73bfa2 100644 --- a/core/datastore/build.gradle.kts +++ b/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 { From fb884f0fd99e418259b7804d1d379d3b55c5a8b9 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sat, 6 Jul 2024 19:19:12 +0900 Subject: [PATCH 2/8] Fix an uninstall app after instrumented tests problem. Change-Id: I07c3e3417a9f14a7f4806d7d61c7ea7f4968ad5e --- gradle.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle.properties b/gradle.properties index 97f940e2e..afc64140f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,3 +42,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 From 280706a3b64293fab61c4c2627f0dc0cb8de23e9 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 08:30:04 +0100 Subject: [PATCH 3/8] Add GitHub Actions bot to Renovate's `gitIgnoredAuthors` To let renovate rebase the reviews when needed, as we sometimes need to update the ringtone dependencies file on top of a dependency bump. --- .github/renovate.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 053b7c7c6..a9eab3c4d 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -5,5 +5,8 @@ ], "baseBranches": [ "main" + ], + "gitIgnoredAuthors": [ + "41898282+github-actions[bot]@users.noreply.github.com" ] -} \ No newline at end of file +} From 21451bd48206111f658fff386bb9470304dc7aec Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 10:23:06 +0100 Subject: [PATCH 4/8] Replace deprecated `stabilityConfigurationFile` with `stabilityConfigurationFiles` https://kotlinlang.org/api/kotlin-gradle-plugin/compose-compiler-gradle-plugin/org.jetbrains.kotlin.compose.compiler.gradle/-compose-compiler-gradle-plugin-extension/stability-configuration-file.html --- .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt index d32470dac..911f02ebb 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt +++ b/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")) } } From db01d6afa582ff6bc93e24b31e93ffcebb9b5062 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 10:26:22 +0100 Subject: [PATCH 5/8] Use lambda syntax --- .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt index 911f02ebb..8fc46a436 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt @@ -67,7 +67,8 @@ internal fun Project.configureAndroidCompose( .relativeToRootProject("compose-reports") .let(reportsDestination::set) - stabilityConfigurationFiles - .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")) + stabilityConfigurationFiles.add { + isolated.rootProject.projectDirectory.file("compose_compiler_config.conf") + } } } From fe1b99f93d6722dcf16ae20beb31160308b1c3bc Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 19 Dec 2024 16:22:57 +0100 Subject: [PATCH 6/8] Restore initial function call --- .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt index 8fc46a436..911f02ebb 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt @@ -67,8 +67,7 @@ internal fun Project.configureAndroidCompose( .relativeToRootProject("compose-reports") .let(reportsDestination::set) - stabilityConfigurationFiles.add { - isolated.rootProject.projectDirectory.file("compose_compiler_config.conf") - } + stabilityConfigurationFiles + .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf")) } } From 4847b91cec2e2cc6a33f716c5021579c88ebeab5 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 20 Dec 2024 11:08:45 +0100 Subject: [PATCH 7/8] Remove last bits of GMD requirements from regular build workflow The removal was initiated in: - https://github.com/android/nowinandroid/pull/1757 --- .github/workflows/Build.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index e090e2155..cfff6e080 100644 --- a/.github/workflows/Build.yaml +++ b/.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 From e0d9281cc5c9a415e2505867d7d2d01d53ea8c02 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 20 Dec 2024 11:10:34 +0100 Subject: [PATCH 8/8] Remove unnecessary steps --- .github/workflows/Build.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index cfff6e080..8e77a2600 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -38,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