Skip to content

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

Merge branch 'main' into av/material-adaptive-beta-01

Don Turnerdfcf4af55af7
diff --cc app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
index 8b082ab3b,1aadbaeae..0b8b6d1cf
--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
@@@ -91,15 -91,15 +91,15 @@@ androidx.vectordrawable:vectordrawable:
androidx.versionedparcelable:versionedparcelable:1.1.1
androidx.viewpager:viewpager:1.0.0
androidx.window.extensions.core:core:1.0.0
-androidx.window:window-core-android:1.3.0-beta01
-androidx.window:window-core:1.3.0-beta01
-androidx.window:window:1.3.0-beta01
+androidx.window:window-core-android:1.3.0-beta02
+androidx.window:window-core:1.3.0-beta02
+androidx.window:window:1.3.0-beta02
com.google.accompanist:accompanist-drawablepainter:0.32.0
com.google.code.findbugs:jsr305:3.0.2
- com.google.dagger:dagger-lint-aar:2.51
- com.google.dagger:dagger:2.51
- com.google.dagger:hilt-android:2.51
- com.google.dagger:hilt-core:2.51
+ com.google.dagger:dagger-lint-aar:2.51.1
+ com.google.dagger:dagger:2.51.1
+ com.google.dagger:hilt-android:2.51.1
+ com.google.dagger:hilt-core:2.51.1
com.google.guava:listenablefuture:1.0
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.8.0
diff --cc gradle/libs.versions.toml
index 1268e7907,ee38f05ff..81a21426b
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -7,11 -7,11 +7,11 @@@ androidTools = "31.4.0
androidxActivity = "1.8.2"
androidxAppCompat = "1.6.1"
androidxBrowser = "1.8.0"
- androidxComposeAlpha = "1.7.0-alpha08"
+ androidxComposeAlpha = "1.7.0-beta01"
androidxComposeBom = "2024.02.02"
androidxComposeCompiler = "1.5.12"
-androidxComposeMaterial3Adaptive = "1.0.0-alpha12"
-androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha07"
+androidxComposeMaterial3Adaptive = "1.0.0-beta01"
+androidxComposeMaterial3AdaptiveNavigationSuite = "1.3.0-beta01"
androidxComposeRuntimeTracing = "1.0.0-beta01"
androidxCore = "1.12.0"
androidxCoreSplashscreen = "1.0.1"