Skip to content

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

Merge branch 'main' into av/remove-dolphin-preview-todos

Don Turner7ca17f68ed0a
diff --cc build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
index 7a81b065b,ec0b0b223..8e96280a6
--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@@ -58,9 -57,13 +57,6 @@@ class AndroidFeatureConventionPlugin :
add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
add("implementation", libs.findLibrary("kotlinx.coroutines.android").get())
--
- add("implementation", libs.findLibrary("hilt.android").get())
- add("kapt", libs.findLibrary("hilt.compiler").get())
- // TODO : Remove this dependency once we upgrade to Android Studio Dolphin b/228889042
- // These dependencies are currently necessary to render Compose previews
- add(
- "debugImplementation",
- libs.findLibrary("androidx.customview.poolingcontainer").get()
- )
}
}
}
diff --cc gradle/libs.versions.toml
index 7fc51499c,b63d2f937..1a37928e1
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -6,10 -6,11 +6,10 @@@ androidxActivity = "1.6.0
androidxAppCompat = "1.5.1"
androidxCompose = "1.3.0-beta02"
androidxComposeRuntimeTracing = "1.0.0-alpha01"
- androidxComposeCompiler = "1.3.1"
- androidxComposeMaterial3 = "1.0.0-alpha13"
+ androidxComposeCompiler = "1.3.2"
+ androidxComposeMaterial3 = "1.0.0-beta03"
androidxCore = "1.9.0"
androidxCoreSplashscreen = "1.0.0"
-androidxCustomView = "1.0.0"
androidxDataStore = "1.0.0"
androidxEspresso = "3.4.0"
androidxHiltNavigationCompose = "1.0.0"