From cde160716edc0429733212ad4ca561137760cf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Burstr=C3=B6m?= Date: Sat, 6 Jul 2024 10:38:46 +0200 Subject: [PATCH 01/18] Explain why the plugins get listed in the root project build script It dispels a bit of the magic that happens during a build. See the patch for the thorough explanation. --- build.gradle.kts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index dffc0c0dd..fbcefa906 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,13 @@ buildscript { } -// Lists all plugins used throughout the project +/* + * By listing all the plugins used throughout all subprojects in the root project build script, it + * ensures that the build script classpath remains the same for all projects. This avoids potential + * problems with mismatching versions of transitive plugin dependencies. A subproject that applies + * an unlisted plugin will have that plugin and its dependencies _appended_ to the classpath, not + * replacing pre-existing dependencies. + */ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false From 214f58bf5923c7b4e156ce4886de98ffaf577a7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:41:37 +0000 Subject: [PATCH 02/18] Bump androidx.test:runner from 1.5.2 to 1.6.2 Bumps androidx.test:runner from 1.5.2 to 1.6.2. --- updated-dependencies: - dependency-name: androidx.test:runner 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 128a4af05..a91644db9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ androidxProfileinstaller = "1.3.1" androidxTestCore = "1.5.0" androidxTestExt = "1.1.5" androidxTestRules = "1.6.1" -androidxTestRunner = "1.5.2" +androidxTestRunner = "1.6.2" androidxTracing = "1.3.0-alpha02" androidxUiAutomator = "2.3.0" androidxWindowManager = "1.3.0" From 9906785642d19316704491aef789a26460d27a5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:41:46 +0000 Subject: [PATCH 03/18] Bump androidGradlePlugin from 8.6.0 to 8.6.1 Bumps `androidGradlePlugin` from 8.6.0 to 8.6.1. Updates `com.android.tools.build:gradle` from 8.6.0 to 8.6.1 Updates `com.android.application` from 8.6.0 to 8.6.1 Updates `com.android.library` from 8.6.0 to 8.6.1 Updates `com.android.test` from 8.6.0 to 8.6.1 --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.android.application dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.android.library dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.android.test 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 128a4af05..d438e0a99 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ accompanist = "0.34.0" androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together -androidGradlePlugin = "8.6.0" +androidGradlePlugin = "8.6.1" androidTools = "31.6.1" androidxActivity = "1.9.2" androidxAppCompat = "1.7.0" From 2789c55bcc3e045cb59ae88fff7339f970ec0d7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:02 +0000 Subject: [PATCH 04/18] Bump androidxLifecycle from 2.8.3 to 2.8.6 Bumps `androidxLifecycle` from 2.8.3 to 2.8.6. Updates `androidx.lifecycle:lifecycle-runtime-compose` from 2.8.3 to 2.8.6 Updates `androidx.lifecycle:lifecycle-runtime-testing` from 2.8.3 to 2.8.6 Updates `androidx.lifecycle:lifecycle-viewmodel-compose` from 2.8.3 to 2.8.6 --- updated-dependencies: - dependency-name: androidx.lifecycle:lifecycle-runtime-compose dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: androidx.lifecycle:lifecycle-runtime-testing dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: androidx.lifecycle:lifecycle-viewmodel-compose 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 128a4af05..2f551245d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ androidxCoreSplashscreen = "1.0.1" androidxDataStore = "1.0.0" androidxEspresso = "3.5.1" androidxHiltNavigationCompose = "1.2.0" -androidxLifecycle = "2.8.3" +androidxLifecycle = "2.8.6" androidxMacroBenchmark = "1.3.0" androidxMetrics = "1.0.0-beta01" androidxNavigation = "2.8.0" From 8e76f52f36200e0fdace11dbc17d6f7b75afca5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:06 +0000 Subject: [PATCH 05/18] Bump com.google.android.gms:play-services-oss-licenses Bumps com.google.android.gms:play-services-oss-licenses from 17.0.1 to 17.1.0. --- updated-dependencies: - dependency-name: com.google.android.gms:play-services-oss-licenses 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 128a4af05..72b90b532 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ firebaseBom = "33.3.0" firebaseCrashlyticsPlugin = "2.9.9" firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.1" -googleOss = "17.0.1" +googleOss = "17.1.0" googleOssPlugin = "0.10.6" hilt = "2.52" hiltExt = "1.2.0" From ab86ba3835a6a4948ecd3564fb9ae4f0642bb88a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:08 +0000 Subject: [PATCH 06/18] Bump com.jraska.module.graph.assertion from 2.5.0 to 2.7.1 Bumps com.jraska.module.graph.assertion from 2.5.0 to 2.7.1. --- updated-dependencies: - dependency-name: com.jraska.module.graph.assertion 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 128a4af05..8efc3fce3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,7 +44,7 @@ kotlinxCoroutines = "1.9.0" kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.3" ksp = "2.0.20-1.0.25" -moduleGraph = "2.5.0" +moduleGraph = "2.7.1" okhttp = "4.12.0" protobuf = "4.26.1" protobufPlugin = "0.9.4" From 5cbcf2ae9e92c9c66ac3870e9d7ebe9bd8ffc331 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:09 +0000 Subject: [PATCH 07/18] Bump androidx.test.ext:junit-ktx from 1.1.5 to 1.2.1 Bumps androidx.test.ext:junit-ktx from 1.1.5 to 1.2.1. --- updated-dependencies: - dependency-name: androidx.test.ext:junit-ktx 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 128a4af05..0ed7a2657 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ androidxMetrics = "1.0.0-beta01" androidxNavigation = "2.8.0" androidxProfileinstaller = "1.3.1" androidxTestCore = "1.5.0" -androidxTestExt = "1.1.5" +androidxTestExt = "1.2.1" androidxTestRules = "1.6.1" androidxTestRunner = "1.5.2" androidxTracing = "1.3.0-alpha02" From 2f281e549a56c30e66309d02baf5a55f61ce3105 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:14 +0000 Subject: [PATCH 08/18] Bump androidxDataStore from 1.0.0 to 1.1.1 Bumps `androidxDataStore` from 1.0.0 to 1.1.1. Updates `androidx.datastore:datastore` from 1.0.0 to 1.1.1 Updates `androidx.datastore:datastore-core` from 1.0.0 to 1.1.1 --- updated-dependencies: - dependency-name: androidx.datastore:datastore dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.datastore:datastore-core 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 128a4af05..09684ea75 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidxComposeBom = "2024.09.00" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0" androidxCoreSplashscreen = "1.0.1" -androidxDataStore = "1.0.0" +androidxDataStore = "1.1.1" androidxEspresso = "3.5.1" androidxHiltNavigationCompose = "1.2.0" androidxLifecycle = "2.8.3" From 714fcde525af03fcadd84e62ac469c99734dfd56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:14 +0000 Subject: [PATCH 09/18] Bump androidx.core:core-ktx from 1.12.0 to 1.13.1 Bumps androidx.core:core-ktx from 1.12.0 to 1.13.1. --- updated-dependencies: - dependency-name: androidx.core:core-ktx 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 128a4af05..470c131eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidxAppCompat = "1.7.0" androidxBrowser = "1.8.0" androidxComposeBom = "2024.09.00" androidxComposeRuntimeTracing = "1.0.0-beta01" -androidxCore = "1.12.0" +androidxCore = "1.13.1" androidxCoreSplashscreen = "1.0.1" androidxDataStore = "1.0.0" androidxEspresso = "3.5.1" From 11b6e446b8e29954b05ef78b1d658ce8663fecb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 08:42:18 +0000 Subject: [PATCH 10/18] Bump org.jetbrains.kotlinx:kotlinx-datetime from 0.5.0 to 0.6.1 Bumps [org.jetbrains.kotlinx:kotlinx-datetime](https://github.com/Kotlin/kotlinx-datetime) from 0.5.0 to 0.6.1. - [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.5.0...v0.6.1) --- 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 128a4af05..3e1e34012 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,7 @@ jacoco = "0.8.7" junit4 = "4.13.2" kotlin = "2.0.20" kotlinxCoroutines = "1.9.0" -kotlinxDatetime = "0.5.0" +kotlinxDatetime = "0.6.1" kotlinxSerializationJson = "1.6.3" ksp = "2.0.20-1.0.25" moduleGraph = "2.5.0" From 247388fb1dde1e842f7ebce8be8185dae3014999 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 23 Sep 2024 08:44:11 +0000 Subject: [PATCH 11/18] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prodReleaseRuntimeClasspath.txt | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index e1c0a6f60..0584fd57b 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -39,11 +39,11 @@ androidx.compose.material:material-icons-extended-android:1.7.0 androidx.compose.material:material-icons-extended:1.7.0 androidx.compose.material:material-ripple-android:1.7.0 androidx.compose.material:material-ripple:1.7.0 -androidx.compose.runtime:runtime-android:1.7.0 -androidx.compose.runtime:runtime-saveable-android:1.7.0 -androidx.compose.runtime:runtime-saveable:1.7.0 +androidx.compose.runtime:runtime-android:1.7.1 +androidx.compose.runtime:runtime-saveable-android:1.7.1 +androidx.compose.runtime:runtime-saveable:1.7.1 androidx.compose.runtime:runtime-tracing:1.0.0-beta01 -androidx.compose.runtime:runtime:1.7.0 +androidx.compose.runtime:runtime:1.7.1 androidx.compose.ui:ui-android:1.7.0 androidx.compose.ui:ui-geometry-android:1.7.0 androidx.compose.ui:ui-geometry:1.7.0 @@ -83,26 +83,26 @@ androidx.hilt:hilt-navigation:1.2.0 androidx.hilt:hilt-work:1.2.0 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.8.3 -androidx.lifecycle:lifecycle-common-jvm:2.8.3 -androidx.lifecycle:lifecycle-common:2.8.3 -androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3 -androidx.lifecycle:lifecycle-livedata-core:2.8.3 -androidx.lifecycle:lifecycle-livedata:2.8.3 -androidx.lifecycle:lifecycle-process:2.8.3 -androidx.lifecycle:lifecycle-runtime-android:2.8.3 -androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3 -androidx.lifecycle:lifecycle-runtime-compose:2.8.3 -androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3 -androidx.lifecycle:lifecycle-runtime-ktx:2.8.3 -androidx.lifecycle:lifecycle-runtime:2.8.3 -androidx.lifecycle:lifecycle-service:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-android:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3 -androidx.lifecycle:lifecycle-viewmodel:2.8.3 +androidx.lifecycle:lifecycle-common-java8:2.8.6 +androidx.lifecycle:lifecycle-common-jvm:2.8.6 +androidx.lifecycle:lifecycle-common:2.8.6 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.6 +androidx.lifecycle:lifecycle-livedata-core:2.8.6 +androidx.lifecycle:lifecycle-livedata:2.8.6 +androidx.lifecycle:lifecycle-process:2.8.6 +androidx.lifecycle:lifecycle-runtime-android:2.8.6 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.6 +androidx.lifecycle:lifecycle-runtime-compose:2.8.6 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.6 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.6 +androidx.lifecycle:lifecycle-runtime:2.8.6 +androidx.lifecycle:lifecycle-service:2.8.6 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.6 +androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.6 +androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6 +androidx.lifecycle:lifecycle-viewmodel:2.8.6 androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.metrics:metrics-performance:1.0.0-beta01 From 04a080cd32ef46491fa3af3e9d8db0f4390cc09f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 23 Sep 2024 08:44:27 +0000 Subject: [PATCH 12/18] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-nia-catalog/dependencies/releaseRuntimeClasspath.txt | 4 ++-- app/dependencies/prodReleaseRuntimeClasspath.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt index 9cec85e71..0c6d06a5c 100644 --- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt +++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt @@ -118,6 +118,6 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0 -org.jetbrains.kotlinx:kotlinx-datetime:0.5.0 +org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1 +org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 org.jetbrains:annotations:23.0.0 diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index e1c0a6f60..26926d144 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -214,8 +214,8 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.9.0 org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.9.0 -org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0 -org.jetbrains.kotlinx:kotlinx-datetime:0.5.0 +org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1 +org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3 org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 From 546f04ce20b97db2cd36042f64cb057fa70c1c38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 23 Sep 2024 08:44:29 +0000 Subject: [PATCH 13/18] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/dependencies/prodReleaseRuntimeClasspath.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index e1c0a6f60..5b30fd003 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -144,7 +144,7 @@ com.google.android.datatransport:transport-api:3.2.0 com.google.android.datatransport:transport-backend-cct:3.3.0 com.google.android.datatransport:transport-runtime:3.3.0 com.google.android.gms:play-services-ads-identifier:18.0.0 -com.google.android.gms:play-services-base:18.0.1 +com.google.android.gms:play-services-base:18.5.0 com.google.android.gms:play-services-basement:18.4.0 com.google.android.gms:play-services-cloud-messaging:17.2.0 com.google.android.gms:play-services-measurement-api:22.1.0 @@ -153,7 +153,7 @@ com.google.android.gms:play-services-measurement-impl:22.1.0 com.google.android.gms:play-services-measurement-sdk-api:22.1.0 com.google.android.gms:play-services-measurement-sdk:22.1.0 com.google.android.gms:play-services-measurement:22.1.0 -com.google.android.gms:play-services-oss-licenses:17.0.1 +com.google.android.gms:play-services-oss-licenses:17.1.0 com.google.android.gms:play-services-stats:17.0.2 com.google.android.gms:play-services-tasks:18.2.0 com.google.code.findbugs:jsr305:3.0.2 From 82ae17805915f37a4f855b651a63a1203f466bed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 23 Sep 2024 08:44:35 +0000 Subject: [PATCH 14/18] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/dependencies/prodReleaseRuntimeClasspath.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index e1c0a6f60..6c7122345 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -66,10 +66,16 @@ androidx.core:core:1.13.1 androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.0.0 -androidx.datastore:datastore-core:1.0.0 -androidx.datastore:datastore-preferences-core:1.0.0 -androidx.datastore:datastore-preferences:1.0.0 -androidx.datastore:datastore:1.0.0 +androidx.datastore:datastore-android:1.1.1 +androidx.datastore:datastore-core-android:1.1.1 +androidx.datastore:datastore-core-okio-jvm:1.1.1 +androidx.datastore:datastore-core-okio:1.1.1 +androidx.datastore:datastore-core:1.1.1 +androidx.datastore:datastore-preferences-android:1.1.1 +androidx.datastore:datastore-preferences-core-jvm:1.1.1 +androidx.datastore:datastore-preferences-core:1.1.1 +androidx.datastore:datastore-preferences:1.1.1 +androidx.datastore:datastore:1.1.1 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 androidx.emoji2:emoji2-views-helper:1.3.0 @@ -204,6 +210,8 @@ io.coil-kt:coil:2.7.0 jakarta.inject:jakarta.inject-api:2.0.1 javax.inject:javax.inject:1 org.checkerframework:checker-qual:3.12.0 +org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22 +org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22 org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 From 20a42241e7009b7a2b1e6577c40f11a9d4a3a86f Mon Sep 17 00:00:00 2001 From: cketti Date: Sat, 28 Sep 2024 13:41:17 +0200 Subject: [PATCH 15/18] Use invariant locale when capitalizing Gradle task names --- .../main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 59eac2322..9eabff31b 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 @@ -108,7 +108,7 @@ abstract class CheckBadgingTask : DefaultTask() { } private fun String.capitalized() = replaceFirstChar { - if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() + if (it.isLowerCase()) it.titlecase() else it.toString() } fun Project.configureBadgingTasks( From 3e8d522aa8f5c3bef96f84559c32ba8a08b3b0d1 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 30 Sep 2024 08:42:40 +0200 Subject: [PATCH 16/18] Initialize DataStore with `TestScope.backgroundScope` in unit tests Fixes #1647 --- .../core/data/repository/OfflineFirstNewsRepositoryTest.kt | 2 +- .../core/data/repository/OfflineFirstTopicsRepositoryTest.kt | 2 +- .../core/data/repository/OfflineFirstUserDataRepositoryTest.kt | 2 +- .../nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt index 47c3996c4..413147f0e 100644 --- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt +++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt @@ -73,7 +73,7 @@ class OfflineFirstNewsRepositoryTest { @Before fun setup() { niaPreferencesDataSource = NiaPreferencesDataSource( - tmpFolder.testUserPreferencesDataStore(testScope), + tmpFolder.testUserPreferencesDataStore(testScope.backgroundScope), ) newsResourceDao = TestNewsResourceDao() topicDao = TestTopicDao() diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt index 3bd314eae..be41c86f2 100644 --- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt +++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt @@ -60,7 +60,7 @@ class OfflineFirstTopicsRepositoryTest { topicDao = TestTopicDao() network = TestNiaNetworkDataSource() niaPreferences = NiaPreferencesDataSource( - tmpFolder.testUserPreferencesDataStore(testScope), + tmpFolder.testUserPreferencesDataStore(testScope.backgroundScope), ) synchronizer = TestSynchronizer(niaPreferences) diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt index 422e2cfb7..88b3251e5 100644 --- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt +++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt @@ -51,7 +51,7 @@ class OfflineFirstUserDataRepositoryTest { @Before fun setup() { niaPreferencesDataSource = NiaPreferencesDataSource( - tmpFolder.testUserPreferencesDataStore(testScope), + tmpFolder.testUserPreferencesDataStore(testScope.backgroundScope), ) subject = OfflineFirstUserDataRepository( diff --git a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt index 433812808..ba1706461 100644 --- a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt +++ b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt @@ -40,7 +40,7 @@ class NiaPreferencesDataSourceTest { @Before fun setup() { subject = NiaPreferencesDataSource( - tmpFolder.testUserPreferencesDataStore(testScope), + tmpFolder.testUserPreferencesDataStore(testScope.backgroundScope), ) } From f89a55477afda709b72856a1fa797b67f3a98bf5 Mon Sep 17 00:00:00 2001 From: Shawn <18649508+NOBLES5E@users.noreply.github.com> Date: Mon, 30 Sep 2024 03:10:09 -0400 Subject: [PATCH 17/18] Update compose_compiler_config.conf --- compose_compiler_config.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose_compiler_config.conf b/compose_compiler_config.conf index d47946206..4337c04cb 100644 --- a/compose_compiler_config.conf +++ b/compose_compiler_config.conf @@ -1,5 +1,5 @@ // This file contains classes (with possible wildcards) that the Compose Compiler will treat as stable. -// It allows us to define classes that our not part of our codebase without wrapping them in a stable class. +// It allows us to define classes that are not part of our codebase without wrapping them in a stable class. // For more information, check https://developer.android.com/jetpack/compose/performance/stability/fix#configuration-file // We always use immutable classes for our data model, to avoid running the Compose compiler From 96f850f2432cc0e579dc12d0f4b77a28bd06540e Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 30 Sep 2024 15:38:29 +0200 Subject: [PATCH 18/18] Fix prodRelease-badging.txt --- app/prodRelease-badging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt index 21b36a7fb..9908e775a 100644 --- a/app/prodRelease-badging.txt +++ b/app/prodRelease-badging.txt @@ -105,9 +105,9 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml' application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml' application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml' launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity' label='' icon='' +uses-library-not-required:'android.ext.adservices' uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar' -uses-library-not-required:'android.ext.adservices' feature-group: label='' uses-feature: name='android.hardware.faketouch' uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps'