Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'main' into dt/nav-safe-args

Don Turner00efda54e8c5
diff --cc build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
index 1aca52136,9110e7fa3..6d0f213d4
--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@@ -27,14 -27,9 +27,10 @@@ class AndroidFeatureConventionPlugin :
with(target) {
pluginManager.apply {
apply("nowinandroid.android.library")
- apply("nowinandroid.android.hilt")
+ apply("nowinandroid.hilt")
+ apply("org.jetbrains.kotlin.plugin.serialization")
}
extensions.configure<LibraryExtension> {
- defaultConfig {
- testInstrumentationRunner =
- "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
- }
testOptions.animationsDisabled = true
configureGradleManagedDevices(this)
}
diff --cc feature/interests/build.gradle.kts
index 3cb4346c7,ca91ba2c4..2b84b135f
--- a/feature/interests/build.gradle.kts
+++ b/feature/interests/build.gradle.kts
@@@ -28,7 -28,7 +28,8 @@@ dependencies
implementation(projects.core.domain)
testImplementation(projects.core.testing)
+ testImplementation(libs.robolectric)
+ androidTestImplementation(libs.bundles.androidx.compose.ui.test)
androidTestImplementation(projects.core.testing)
}
diff --cc feature/topic/build.gradle.kts
index 0b554c936,726920af1..bd8b59ec8
--- a/feature/topic/build.gradle.kts
+++ b/feature/topic/build.gradle.kts
@@@ -28,7 -28,7 +28,8 @@@ dependencies
implementation(projects.core.data)
testImplementation(projects.core.testing)
+ testImplementation(libs.robolectric)
+ androidTestImplementation(libs.bundles.androidx.compose.ui.test)
androidTestImplementation(projects.core.testing)
}
diff --cc gradle/libs.versions.toml
index 5536353e2,7047ac665..5946bc447
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -18,10 -17,10 +17,10 @@@ androidxCoreSplashscreen = "1.0.1
androidxDataStore = "1.0.0"
androidxEspresso = "3.5.1"
androidxHiltNavigationCompose = "1.2.0"
- androidxLifecycle = "2.7.0"
+ androidxLifecycle = "2.8.3"
androidxMacroBenchmark = "1.2.4"
androidxMetrics = "1.0.0-alpha04"
-androidxNavigation = "2.8.0-alpha06"
+androidxNavigation = "2.8.0-beta01"
androidxProfileinstaller = "1.3.1"
androidxTestCore = "1.5.0"
androidxTestExt = "1.1.5"