A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge remote-tracking branch 'origin/main' into fix/1161-2
Simon Marquis61143ca98b05
diff --cc app/build.gradle.ktsindex 1eb28cd46,355ec42c0..47b8af943--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@@ -112,9 -112,11 +112,8 @@@ dependencieskspTest(libs.hilt.compiler)testImplementation(projects.core.dataTest)- testImplementation(libs.accompanist.testharness)- testImplementation(projects.core.testing)- testImplementation(projects.sync.syncTest)- testImplementation(libs.androidx.compose.ui.test)- testImplementation(libs.androidx.work.testing)testImplementation(libs.hilt.android.testing)- testImplementation(libs.work.testing)++ testImplementation(projects.sync.syncTest)testDemoImplementation(libs.robolectric)testDemoImplementation(libs.roborazzi)diff --cc core/designsystem/build.gradle.ktsindex a8d6ea9c5,080100a66..3810080f0--- a/core/designsystem/build.gradle.kts+++ b/core/designsystem/build.gradle.kts@@@ -40,10 -40,14 +40,11 @@@ dependenciesimplementation(libs.coil.kt.compose)testImplementation(libs.androidx.compose.ui.test)- testImplementation(libs.accompanist.testharness)+ testImplementation(libs.androidx.compose.ui.testManifest)+testImplementation(libs.hilt.android.testing)testImplementation(libs.robolectric)- testImplementation(libs.roborazzi)testImplementation(projects.core.screenshotTesting)- testImplementation(projects.core.testing)- androidTestImplementation(libs.androidx.compose.ui.test)- androidTestImplementation(projects.core.testing)+ androidTestImplementation(libs.bundles.androidx.compose.ui.test)}diff --cc core/screenshot-testing/build.gradle.ktsindex dd6e43fb3,fb23cf057..1b816fc67--- a/core/screenshot-testing/build.gradle.kts+++ b/core/screenshot-testing/build.gradle.kts@@@ -24,10 -24,11 +24,10 @@@ android}dependencies {+ api(libs.bundles.androidx.compose.ui.test)api(libs.roborazzi)- implementation(libs.accompanist.testharness)+ implementation(libs.androidx.compose.ui.test)implementation(libs.androidx.activity.compose)- implementation(libs.androidx.compose.ui.test)implementation(libs.robolectric)- implementation(projects.core.common)implementation(projects.core.designsystem)}diff --cc gradle/libs.versions.tomlindex 2c1236d9d,1374261ce..a0892944c--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@@ -57,14 -58,10 +58,13 @@@ roborazzi = "1.7.0room = "2.6.1"secrets = "2.0.1"truth = "1.4.2"- turbine = "1.0.0"+ turbine = "1.1.0"+[bundles]+androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"]+[libraries]accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }- accompanist-testharness = { group = "com.google.accompanist", name = "accompanist-testharness", version.ref = "accompanist" }android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }