Merge branch 'dev_beta02' into jetnews-beta02

yrezgui · web-flow · commit df95fd8bc936 · 2021-03-11T07:47:50.000Z
diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/utils/SystemUi.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/utils/SystemUi.kt
@@ -141,7 +141,7 @@ private class SystemUiControllerImpl(private val window: Window) : SystemUiContr
 }
 
 /**
- * An [androidx.compose.runtime.Ambient] holding the current [LocalSysUiController]. Defaults to a
+ * An [androidx.compose.runtime.CompositionLocalProvider] holding the current [LocalSysUiController]. Defaults to a
  * no-op controller; consumers should [provide][androidx.compose.runtime.CompositionLocalProvider] a real one.
  */
 val LocalSysUiController = staticCompositionLocalOf<SystemUiController> {
diff --git a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt
@@ -21,16 +21,16 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha09"
 
     object Accompanist {
-        private const val version = "0.6.0"
+        private const val version = "0.6.2.compose-7184376-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }
 
     object Kotlin {
-        private const val version = "1.4.30"
+        private const val version = "1.4.31"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -44,11 +44,11 @@ object Libs {
     }
 
     object AndroidX {
-        const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"
+        const val coreKtx = "androidx.core:core-ktx:1.5.0-SNAPSHOT"
 
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-beta01"
+            const val snapshot = "7184376"
+            const val version = "1.0.0-SNAPSHOT"
 
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -62,12 +62,12 @@ object Libs {
         }
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
         }
 
         object Lifecycle {
             const val viewModelCompose =
-                "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
+                "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
         }
 
         object ConstraintLayout {

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private class SystemUiControllerImpl(private val window: Window) : SystemUiContr`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`/**`
`144`		`- * An [androidx.compose.runtime.Ambient] holding the current [LocalSysUiController]. Defaults to a`
	`144`	`+ * An [androidx.compose.runtime.CompositionLocalProvider] holding the current [LocalSysUiController]. Defaults to a`
`145`	`145`	`* no-op controller; consumers should [provide][androidx.compose.runtime.CompositionLocalProvider] a real one.`
`146`	`146`	`*/`
`147`	`147`	`val LocalSysUiController = staticCompositionLocalOf<SystemUiController> {`