From a96e0709d83d0df6c3432018661dcd204354be51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:06:44 +0000 Subject: [PATCH 01/22] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/Build.yaml | 4 ++-- .github/workflows/Release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index ca161b0a4..9c103ca46 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -31,7 +31,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 @@ -128,7 +128,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index f85215b74..f4901b9e2 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -21,7 +21,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 From af26182193a4752c0c7a64ef2636166f3d8a04a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:10:32 +0000 Subject: [PATCH 02/22] Bump hilt from 2.48.1 to 2.49 Bumps `hilt` from 2.48.1 to 2.49. Updates `com.google.dagger:hilt-android` from 2.48.1 to 2.49 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.48.1...dagger-2.49) Updates `com.google.dagger:hilt-android-testing` from 2.48.1 to 2.49 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.48.1...dagger-2.49) Updates `com.google.dagger:hilt-android-compiler` from 2.48.1 to 2.49 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.48.1...dagger-2.49) Updates `com.google.dagger.hilt.android` from 2.48.1 to 2.49 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.48.1...dagger-2.49) --- updated-dependencies: - dependency-name: com.google.dagger:hilt-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android-testing dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android-compiler dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger.hilt.android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa2a32e90..c1f426bd3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.0" googleOss = "17.0.1" googleOssPlugin = "0.10.6" -hilt = "2.48.1" +hilt = "2.49" hiltExt = "1.1.0" jacoco = "0.8.7" junit4 = "4.13.2" From b80e8a5e3f851e62ebe021a75bc8f5697b1f9c54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:10:36 +0000 Subject: [PATCH 03/22] Bump org.jetbrains.kotlinx:kotlinx-datetime from 0.4.1 to 0.5.0 Bumps [org.jetbrains.kotlinx:kotlinx-datetime](https://github.com/Kotlin/kotlinx-datetime) from 0.4.1 to 0.5.0. - [Release notes](https://github.com/Kotlin/kotlinx-datetime/releases) - [Changelog](https://github.com/Kotlin/kotlinx-datetime/blob/master/CHANGELOG.md) - [Commits](https://github.com/Kotlin/kotlinx-datetime/compare/v0.4.1...v0.5.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-datetime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa2a32e90..41c92c2f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,7 +44,7 @@ jacoco = "0.8.7" junit4 = "4.13.2" kotlin = "1.9.10" kotlinxCoroutines = "1.7.3" -kotlinxDatetime = "0.4.1" +kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.0" ksp = "1.9.10-1.0.13" lint = "31.1.3" From b75ddce6308dc71df28bae69d1da26761bc34152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:10:38 +0000 Subject: [PATCH 04/22] Bump androidx.compose.runtime:runtime-tracing Bumps androidx.compose.runtime:runtime-tracing from 1.0.0-alpha03 to 1.0.0-beta01. --- updated-dependencies: - dependency-name: androidx.compose.runtime:runtime-tracing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa2a32e90..d265e2a73 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidxAppCompat = "1.6.1" androidxBrowser = "1.6.0" androidxComposeBom = "2023.10.01" androidxComposeCompiler = "1.5.3" -androidxComposeRuntimeTracing = "1.0.0-alpha03" +androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0" androidxCoreSplashscreen = "1.0.1" androidxDataStore = "1.0.0" From 9a8bfd86eda6c3e8f5b93ddf37ff6b2ef6617ad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:10:43 +0000 Subject: [PATCH 05/22] Bump androidxMacroBenchmark from 1.2.0 to 1.2.2 Bumps `androidxMacroBenchmark` from 1.2.0 to 1.2.2. Updates `androidx.benchmark:benchmark-macro-junit4` from 1.2.0 to 1.2.2 Updates `androidx.baselineprofile` from 1.2.0 to 1.2.2 --- updated-dependencies: - dependency-name: androidx.benchmark:benchmark-macro-junit4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: androidx.baselineprofile dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa2a32e90..a82684d1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ androidxEspresso = "3.5.1" androidxHiltNavigationCompose = "1.0.0" androidxJunit = "1.1.5" androidxLifecycle = "2.6.2" -androidxMacroBenchmark = "1.2.0" +androidxMacroBenchmark = "1.2.2" androidxMetrics = "1.0.0-alpha04" androidxNavigation = "2.7.4" androidxProfileinstaller = "1.3.1" From 5df9cce37cf8a5df494fe1772802d21ba6c13147 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Fri, 8 Dec 2023 11:32:01 -0800 Subject: [PATCH 06/22] Add truth for better badging diff output Change-Id: Id3fab0107bc08adf44ddf07a30e0327e06897d47 --- build-logic/convention/build.gradle.kts | 1 + .../samples/apps/nowinandroid/Badging.kt | 20 +++++++------------ gradle/libs.versions.toml | 2 ++ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index ea57a7c8c..e11a1b42a 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -41,6 +41,7 @@ dependencies { compileOnly(libs.firebase.performance.gradlePlugin) compileOnly(libs.kotlin.gradlePlugin) compileOnly(libs.ksp.gradlePlugin) + implementation(libs.truth) } tasks { diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt index 2a776e429..c59d3ffb8 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt @@ -20,8 +20,8 @@ import com.android.build.api.artifact.SingleArtifact import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.gradle.BaseExtension import com.android.SdkConstants +import com.google.common.truth.Truth.assertWithMessage import org.gradle.api.DefaultTask -import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.file.DirectoryProperty import org.gradle.api.file.RegularFileProperty @@ -40,7 +40,6 @@ import org.gradle.kotlin.dsl.register import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.process.ExecOperations import java.io.File -import java.nio.file.Files import javax.inject.Inject @CacheableTask @@ -98,17 +97,12 @@ abstract class CheckBadgingTask : DefaultTask() { @TaskAction fun taskAction() { - if ( - Files.mismatch( - goldenBadging.get().asFile.toPath(), - generatedBadging.get().asFile.toPath(), - ) != -1L - ) { - throw GradleException( - "Generated badging is different from golden badging! " + - "If this change is intended, run ./gradlew ${updateBadgingTaskName.get()}", - ) - } + assertWithMessage( + "Generated badging is different from golden badging! " + + "If this change is intended, run ./gradlew ${updateBadgingTaskName.get()}", + ) + .that(generatedBadging.get().asFile.readText()) + .isEqualTo(goldenBadging.get().asFile.readText()) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa2a32e90..4f55e6290 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,6 +57,7 @@ robolectric = "4.11.1" roborazzi = "1.6.0" room = "2.6.0" secrets = "2.0.1" +truth = "1.1.5" turbine = "1.0.0" [libraries] @@ -140,6 +141,7 @@ roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", versi room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +truth = { group = "com.google.truth", name = "truth", version.ref = "truth" } turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" } # Dependencies of the included build-logic From 8d0a9bacd48e5a35f9124f2848dcc74dac59e470 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 9 Dec 2023 10:25:22 +0100 Subject: [PATCH 07/22] Update max concurrent PRs for dependabot We currently have many pending updates that are not listed and the default 5 concurrent PRs is very limiting. See documentation on https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 00ada2a1c..d77a706b3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,6 +18,7 @@ updates: - "org.jetbrains.kotlin.jvm" - "com.google.devtools.ksp" - "androidx.compose.compiler:compiler" + open-pull-requests-limit: 10 registries: maven-google: type: "maven-repository" From 02adbe0aada8da1448c1661e8c19743e29980afa Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 9 Dec 2023 09:29:17 +0000 Subject: [PATCH 08/22] Remove unnecessary FlowPreview opt-in --- .../kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt index 04ee4e56e..d7cadf8d7 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt @@ -86,7 +86,6 @@ private fun Project.configureKotlin() { "-opt-in=kotlin.RequiresOptIn", // Enable experimental coroutines APIs, including Flow "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-opt-in=kotlinx.coroutines.FlowPreview", ) } } From e305b07271278eba15d7e3dc4bc4a184aa28cceb Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 9 Dec 2023 09:32:00 +0000 Subject: [PATCH 09/22] Remove unnecessary RequiresOptIn opt-in --- .../kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt index 04ee4e56e..b453cf722 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt @@ -83,7 +83,6 @@ private fun Project.configureKotlin() { val warningsAsErrors: String? by project allWarningsAsErrors = warningsAsErrors.toBoolean() freeCompilerArgs = freeCompilerArgs + listOf( - "-opt-in=kotlin.RequiresOptIn", // Enable experimental coroutines APIs, including Flow "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-opt-in=kotlinx.coroutines.FlowPreview", From 83764082ffb7871d175cd915197a309f837797b5 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 16 Dec 2023 10:50:38 +0000 Subject: [PATCH 10/22] Move app screenshot tests to match dependencies declaration Fixes #990 --- .../ui/NiaAppScreenSizesScreenshotTests.kt | 2 +- ...ompactWidth_compactHeight_showsNavigationBar.png | Bin ...mpactWidth_expandedHeight_showsNavigationBar.png | Bin ...compactWidth_mediumHeight_showsNavigationBar.png | Bin ...andedWidth_compactHeight_showsNavigationRail.png | Bin ...ndedWidth_expandedHeight_showsNavigationRail.png | Bin ...pandedWidth_mediumHeight_showsNavigationRail.png | Bin ...ediumWidth_compactHeight_showsNavigationRail.png | Bin ...diumWidth_expandedHeight_showsNavigationRail.png | Bin ...mediumWidth_mediumHeight_showsNavigationRail.png | Bin 10 files changed, 1 insertion(+), 1 deletion(-) rename app/src/{testDemo => testDemoDebug}/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt (99%) rename app/src/{testDemo => testDemoDebug}/screenshots/compactWidth_compactHeight_showsNavigationBar.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/compactWidth_expandedHeight_showsNavigationBar.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/compactWidth_mediumHeight_showsNavigationBar.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/expandedWidth_compactHeight_showsNavigationRail.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/mediumWidth_compactHeight_showsNavigationRail.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png (100%) rename app/src/{testDemo => testDemoDebug}/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png (100%) diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt similarity index 99% rename from app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt rename to app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt index dcbc1e5c0..63a7c7f91 100644 --- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt +++ b/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt @@ -154,7 +154,7 @@ class NiaAppScreenSizesScreenshotTests { composeTestRule.onRoot() .captureRoboImage( - "src/testDemo/screenshots/$screenshotName.png", + "src/testDemoDebug/screenshots/$screenshotName.png", roborazziOptions = DefaultRoborazziOptions, ) } diff --git a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png b/app/src/testDemoDebug/screenshots/compactWidth_compactHeight_showsNavigationBar.png similarity index 100% rename from app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png rename to app/src/testDemoDebug/screenshots/compactWidth_compactHeight_showsNavigationBar.png diff --git a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png b/app/src/testDemoDebug/screenshots/compactWidth_expandedHeight_showsNavigationBar.png similarity index 100% rename from app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png rename to app/src/testDemoDebug/screenshots/compactWidth_expandedHeight_showsNavigationBar.png diff --git a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png b/app/src/testDemoDebug/screenshots/compactWidth_mediumHeight_showsNavigationBar.png similarity index 100% rename from app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png rename to app/src/testDemoDebug/screenshots/compactWidth_mediumHeight_showsNavigationBar.png diff --git a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.png b/app/src/testDemoDebug/screenshots/expandedWidth_compactHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.png rename to app/src/testDemoDebug/screenshots/expandedWidth_compactHeight_showsNavigationRail.png diff --git a/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png b/app/src/testDemoDebug/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png rename to app/src/testDemoDebug/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png diff --git a/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png b/app/src/testDemoDebug/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png rename to app/src/testDemoDebug/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png diff --git a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.png b/app/src/testDemoDebug/screenshots/mediumWidth_compactHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.png rename to app/src/testDemoDebug/screenshots/mediumWidth_compactHeight_showsNavigationRail.png diff --git a/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png b/app/src/testDemoDebug/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png rename to app/src/testDemoDebug/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png diff --git a/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png b/app/src/testDemoDebug/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png rename to app/src/testDemoDebug/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png From f9a498caf6b5f67c8646813be21ad757ff182ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 08:44:06 +0000 Subject: [PATCH 11/22] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/Build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index d47342c6a..791cf6127 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -91,14 +91,14 @@ jobs: -x collectProdNonMinifiedBenchmarkBaselineProfile - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: APKs path: '**/build/outputs/apk/**/*.apk' - name: Upload test results (XML) if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-results path: '**/build/test-results/test*UnitTest/**.xml' @@ -108,7 +108,7 @@ jobs: - name: Upload lint reports (HTML) if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: lint-reports path: '**/build/reports/lint-results-*.html' @@ -154,7 +154,7 @@ jobs: - name: Upload test reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-reports-${{ matrix.api-level }} path: '**/build/reports/androidTests' From e6b5560f078e371fef4513848f833b0087fffd63 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 19 Dec 2023 14:59:53 +0000 Subject: [PATCH 12/22] Revert "Move app screenshot tests to match dependencies declaration" --- .../ui/NiaAppScreenSizesScreenshotTests.kt | 2 +- ...ompactWidth_compactHeight_showsNavigationBar.png | Bin ...mpactWidth_expandedHeight_showsNavigationBar.png | Bin ...compactWidth_mediumHeight_showsNavigationBar.png | Bin ...andedWidth_compactHeight_showsNavigationRail.png | Bin ...ndedWidth_expandedHeight_showsNavigationRail.png | Bin ...pandedWidth_mediumHeight_showsNavigationRail.png | Bin ...ediumWidth_compactHeight_showsNavigationRail.png | Bin ...diumWidth_expandedHeight_showsNavigationRail.png | Bin ...mediumWidth_mediumHeight_showsNavigationRail.png | Bin 10 files changed, 1 insertion(+), 1 deletion(-) rename app/src/{testDemoDebug => testDemo}/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt (99%) rename app/src/{testDemoDebug => testDemo}/screenshots/compactWidth_compactHeight_showsNavigationBar.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/compactWidth_expandedHeight_showsNavigationBar.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/compactWidth_mediumHeight_showsNavigationBar.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/expandedWidth_compactHeight_showsNavigationRail.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/mediumWidth_compactHeight_showsNavigationRail.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png (100%) rename app/src/{testDemoDebug => testDemo}/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png (100%) diff --git a/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt similarity index 99% rename from app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt rename to app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt index 63a7c7f91..dcbc1e5c0 100644 --- a/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt +++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt @@ -154,7 +154,7 @@ class NiaAppScreenSizesScreenshotTests { composeTestRule.onRoot() .captureRoboImage( - "src/testDemoDebug/screenshots/$screenshotName.png", + "src/testDemo/screenshots/$screenshotName.png", roborazziOptions = DefaultRoborazziOptions, ) } diff --git a/app/src/testDemoDebug/screenshots/compactWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png similarity index 100% rename from app/src/testDemoDebug/screenshots/compactWidth_compactHeight_showsNavigationBar.png rename to app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png diff --git a/app/src/testDemoDebug/screenshots/compactWidth_expandedHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png similarity index 100% rename from app/src/testDemoDebug/screenshots/compactWidth_expandedHeight_showsNavigationBar.png rename to app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png diff --git a/app/src/testDemoDebug/screenshots/compactWidth_mediumHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png similarity index 100% rename from app/src/testDemoDebug/screenshots/compactWidth_mediumHeight_showsNavigationBar.png rename to app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png diff --git a/app/src/testDemoDebug/screenshots/expandedWidth_compactHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemoDebug/screenshots/expandedWidth_compactHeight_showsNavigationRail.png rename to app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationRail.png diff --git a/app/src/testDemoDebug/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemoDebug/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png rename to app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png diff --git a/app/src/testDemoDebug/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemoDebug/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png rename to app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png diff --git a/app/src/testDemoDebug/screenshots/mediumWidth_compactHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemoDebug/screenshots/mediumWidth_compactHeight_showsNavigationRail.png rename to app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationRail.png diff --git a/app/src/testDemoDebug/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemoDebug/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png rename to app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png diff --git a/app/src/testDemoDebug/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png similarity index 100% rename from app/src/testDemoDebug/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png rename to app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png From d711a1a4dd08a5a36a2731c7617a995aa4559a36 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 19 Dec 2023 15:50:56 +0000 Subject: [PATCH 13/22] Update README.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b71427dfe..6f13f5de2 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The app is currently in development. The `prodRelease` variant is [available on **Now in Android** displays content from the [Now in Android](https://developer.android.com/series/now-in-android) series. Users can browse for links to recent videos, articles and other content. Users can also follow topics they are interested -in. +in, and be notified when new content is published which matches interests they are following. ## Screenshots @@ -109,12 +109,42 @@ Examples: manipulate the state of the `Test` repository and verify the resulting behavior, instead of checking that specific repository methods were called. -## Screenshot tests +To run the tests execute the following gradle tasks: + +- `testDemoDebug` run all local tests against the `demoDebug` variant. +- `connectedDemoDebugAndroidTest` run all instrumented tests against the `demoDebug` variant. -**Now In Android** uses [Roborazzi](https://github.com/takahirom/roborazzi) to do screenshot tests -of certain screens and components. To run these tests, run the `verifyRoborazziDemoDebug` or -`recordRoborazziDemoDebug` tasks. Note that screenshots are recorded on CI, using Linux, and other -platforms might generate slightly different images, making the tests fail. +**Note:** You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute +tests against _all_ build variants which is both unecessary and will result in failures as only the +`demoDebug` variant is supported. No other variants have any tests (although this might change in future). + +## Screenshot tests +A screenshot test takes a screenshot of a screen or a UI component within the app, and compares it +with a previously recorded screenshot which is known to be rendered correctly. + +For example, Now in Android has [screenshot tests](https://github.com/android/nowinandroid/blob/main/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt) +to verify that the navigation is displayed correctly on different screen sizes +([known correct screenshots](https://github.com/android/nowinandroid/tree/main/app/src/testDemoDebug/screenshots)). + +Now In Android uses [Roborazzi](https://github.com/takahirom/roborazzi) to run screenshot tests +of certain screens and UI components. When working with screenshot tests the following gradle tasks are useful: + +- `verifyRoborazziDemoDebug` run all screenshot tests, verifying the screenshots against the known +correct screenshots. +- `recordRoborazziDemoDebug` record new "known correct" screenshots. Use this command when you have +made changes to the UI and manually verified that they are rendered correctly. Screenshots will be +stored in `modulename/src/test/screenshots`. +- `compareRoborazziDemoDebug` create comparison images between failed tests and the known correct +images. These can also be found in `modulename/src/test/screenshots`. + +**Note:** The known correct screenshots stored in this repository are recorded on CI using Linux. Other +platforms may (and probably will) generate slightly different images, making the screenshot tests fail. +When working on a non-Linux platform, a workaround to this is to run `recordRoborazziDemoDebug` on the +`main` branch before starting work. After making changes, `verifyRoborazziDemoDebug` will identify only +legitimate changes. + +For more information about screenshot testing +[check out this talk](https://www.droidcon.com/2023/11/15/easy-screenshot-testing-with-compose/). # UI The app was designed using [Material 3 guidelines](https://m3.material.io/). Learn more about the design process and From a49e901fb419d179387382e72f927ef3363dfe8e Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 19 Dec 2023 16:02:35 +0000 Subject: [PATCH 14/22] Don't run unit tests on prodDebug variant Change-Id: I0adf6c70b9634de876aed64400a7d3b4033983b3 --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index d47342c6a..d1d631117 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -75,7 +75,7 @@ jobs: # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots. - name: Run local tests if: always() - run: ./gradlew testDemoDebug testProdDebug :lint:test + run: ./gradlew testDemoDebug :lint:test # Replace task exclusions with `-Pandroidx.baselineprofile.skipgeneration` when # https://android-review.googlesource.com/c/platform/frameworks/support/+/2602790 landed in a # release build From 115e66b6e34950354bf3f28617d2c67674509b29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:18:00 +0000 Subject: [PATCH 15/22] Bump lint from 31.1.3 to 31.2.0 Bumps `lint` from 31.1.3 to 31.2.0. Updates `com.android.tools.lint:lint-api` from 31.1.3 to 31.2.0 Updates `com.android.tools.lint:lint-checks` from 31.1.3 to 31.2.0 Updates `com.android.tools.lint:lint-tests` from 31.1.3 to 31.2.0 --- updated-dependencies: - dependency-name: com.android.tools.lint:lint-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.android.tools.lint:lint-checks dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.android.tools.lint:lint-tests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..7333db3dd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,7 +47,7 @@ kotlinxCoroutines = "1.7.3" kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.0" ksp = "1.9.10-1.0.13" -lint = "31.1.3" +lint = "31.2.0" okhttp = "4.12.0" protobuf = "3.24.4" protobufPlugin = "0.9.4" From f36af7c2102a15f73e467d931456e97532834c8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:18:46 +0000 Subject: [PATCH 16/22] Bump hilt from 2.49 to 2.50 Bumps `hilt` from 2.49 to 2.50. Updates `com.google.dagger:hilt-android` from 2.49 to 2.50 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.49...dagger-2.50) Updates `com.google.dagger:hilt-android-testing` from 2.49 to 2.50 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.49...dagger-2.50) Updates `com.google.dagger:hilt-android-compiler` from 2.49 to 2.50 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.49...dagger-2.50) Updates `com.google.dagger.hilt.android` from 2.49 to 2.50 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.49...dagger-2.50) --- updated-dependencies: - dependency-name: com.google.dagger:hilt-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android-testing dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android-compiler dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger.hilt.android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..df5db8cd0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.0" googleOss = "17.0.1" googleOssPlugin = "0.10.6" -hilt = "2.49" +hilt = "2.50" hiltExt = "1.1.0" jacoco = "0.8.7" junit4 = "4.13.2" From 60c5f5ee264c9dc08b521bccbbef4bcad09f2f34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:19:42 +0000 Subject: [PATCH 17/22] Bump coil from 2.4.0 to 2.5.0 Bumps `coil` from 2.4.0 to 2.5.0. Updates `io.coil-kt:coil` from 2.4.0 to 2.5.0 - [Release notes](https://github.com/coil-kt/coil/releases) - [Changelog](https://github.com/coil-kt/coil/blob/main/CHANGELOG.md) - [Commits](https://github.com/coil-kt/coil/compare/2.4.0...2.5.0) Updates `io.coil-kt:coil-compose` from 2.4.0 to 2.5.0 - [Release notes](https://github.com/coil-kt/coil/releases) - [Changelog](https://github.com/coil-kt/coil/blob/main/CHANGELOG.md) - [Commits](https://github.com/coil-kt/coil/compare/2.4.0...2.5.0) Updates `io.coil-kt:coil-svg` from 2.4.0 to 2.5.0 - [Release notes](https://github.com/coil-kt/coil/releases) - [Changelog](https://github.com/coil-kt/coil/blob/main/CHANGELOG.md) - [Commits](https://github.com/coil-kt/coil/compare/2.4.0...2.5.0) --- updated-dependencies: - dependency-name: io.coil-kt:coil dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.coil-kt:coil-compose dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.coil-kt:coil-svg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..6268707b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ androidxTracing = "1.1.0" androidxUiAutomator = "2.2.0" androidxWindowManager = "1.1.0" androidxWork = "2.9.0-rc01" -coil = "2.4.0" +coil = "2.5.0" dependencyGuard = "0.4.3" firebaseBom = "32.4.0" firebaseCrashlyticsPlugin = "2.9.9" From e9f7cb820457c20f0f79f6e6e4c35434c16d4a45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:19:58 +0000 Subject: [PATCH 18/22] Bump room from 2.6.0 to 2.6.1 Bumps `room` from 2.6.0 to 2.6.1. Updates `androidx.room:room-compiler` from 2.6.0 to 2.6.1 Updates `androidx.room:room-ktx` from 2.6.0 to 2.6.1 Updates `androidx.room:room-runtime` from 2.6.0 to 2.6.1 --- updated-dependencies: - dependency-name: androidx.room:room-compiler dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: androidx.room:room-ktx dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: androidx.room:room-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..90e8bd2bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,7 +55,7 @@ retrofit = "2.9.0" retrofitKotlinxSerializationJson = "1.0.0" robolectric = "4.11.1" roborazzi = "1.6.0" -room = "2.6.0" +room = "2.6.1" secrets = "2.0.1" truth = "1.1.5" turbine = "1.0.0" From a878e70f418a2aa88fe07a6e921a06dac42f8800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:20:43 +0000 Subject: [PATCH 19/22] Bump androidGradlePlugin from 8.1.3 to 8.2.0 Bumps `androidGradlePlugin` from 8.1.3 to 8.2.0. Updates `com.android.tools.build:gradle` from 8.1.3 to 8.2.0 Updates `com.android.application` from 8.1.3 to 8.2.0 Updates `com.android.library` from 8.1.3 to 8.2.0 Updates `com.android.test` from 8.1.3 to 8.2.0 --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.android.application dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.android.library dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.android.test dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..15ea9b0c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ accompanist = "0.32.0" androidDesugarJdkLibs = "2.0.3" # AGP and tools should be updated together -androidGradlePlugin = "8.1.3" +androidGradlePlugin = "8.2.0" androidTools = "31.1.3" androidxActivity = "1.8.0" androidxAppCompat = "1.6.1" From 334377e303e9708240729a575bf607697a23ad65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:20:59 +0000 Subject: [PATCH 20/22] Bump androidx.window:window from 1.1.0 to 1.2.0 Bumps androidx.window:window from 1.1.0 to 1.2.0. --- updated-dependencies: - dependency-name: androidx.window:window dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..2f529984d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ androidxTestRules = "1.5.0" androidxTestRunner = "1.5.2" androidxTracing = "1.1.0" androidxUiAutomator = "2.2.0" -androidxWindowManager = "1.1.0" +androidxWindowManager = "1.2.0" androidxWork = "2.9.0-rc01" coil = "2.4.0" dependencyGuard = "0.4.3" From 5ccf4f5ec61e1a4304d7ff86af95370989cee32a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:21:06 +0000 Subject: [PATCH 21/22] Bump com.android.tools:desugar_jdk_libs from 2.0.3 to 2.0.4 Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.0.3 to 2.0.4. - [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/desugar_jdk_libs/commits) --- updated-dependencies: - dependency-name: com.android.tools:desugar_jdk_libs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95fb23428..94823336d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanist = "0.32.0" -androidDesugarJdkLibs = "2.0.3" +androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together androidGradlePlugin = "8.1.3" androidTools = "31.1.3" From 2dd917fd7de59803745cc10c7ddcf06b5a083a07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:22:19 +0000 Subject: [PATCH 22/22] Bump the kotlin-ksp-compose group with 7 updates Bumps the kotlin-ksp-compose group with 7 updates: | Package | From | To | | --- | --- | --- | | androidx.compose.compiler:compiler | `1.5.3` | `1.5.7` | | [org.jetbrains.kotlin:kotlin-stdlib-jdk8](https://github.com/JetBrains/kotlin) | `1.9.10` | `1.9.21` | | [org.jetbrains.kotlin:kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) | `1.9.10` | `1.9.21` | | [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) | `1.9.10` | `1.9.21` | | [org.jetbrains.kotlin.plugin.serialization](https://github.com/JetBrains/kotlin) | `1.9.10` | `1.9.21` | | [com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin](https://github.com/google/ksp) | `1.9.10-1.0.13` | `1.9.21-1.0.16` | | [com.google.devtools.ksp](https://github.com/google/ksp) | `1.9.10-1.0.13` | `1.9.21-1.0.16` | Updates `androidx.compose.compiler:compiler` from 1.5.3 to 1.5.7 Updates `org.jetbrains.kotlin:kotlin-stdlib-jdk8` from 1.9.10 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.21) Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.9.10 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.21) Updates `org.jetbrains.kotlin.jvm` from 1.9.10 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.21) Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.10 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.21) Updates `com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin` from 1.9.10-1.0.13 to 1.9.21-1.0.16 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/1.9.10-1.0.13...1.9.21-1.0.16) Updates `com.google.devtools.ksp` from 1.9.10-1.0.13 to 1.9.21-1.0.16 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/1.9.10-1.0.13...1.9.21-1.0.16) --- updated-dependencies: - dependency-name: androidx.compose.compiler:compiler dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose - dependency-name: com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose - dependency-name: com.google.devtools.ksp dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp-compose ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 65ddba6bc..95f3c7827 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidxActivity = "1.8.0" androidxAppCompat = "1.6.1" androidxBrowser = "1.6.0" androidxComposeBom = "2023.10.01" -androidxComposeCompiler = "1.5.3" +androidxComposeCompiler = "1.5.7" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0" androidxCoreSplashscreen = "1.0.1" @@ -42,11 +42,11 @@ hilt = "2.49" hiltExt = "1.1.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.9.10" +kotlin = "1.9.21" kotlinxCoroutines = "1.7.3" kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.0" -ksp = "1.9.10-1.0.13" +ksp = "1.9.21-1.0.16" lint = "31.2.0" okhttp = "4.12.0" protobuf = "3.24.4"