Merge pull request #704 from android/ss/v1.1.0-beta03

simona-anomis · web-flow · commit 82e5bf054680 · 2021-11-22T18:32:48.000Z
[All] Update to Compose 1.1.0-beta03
diff --git a/Crane/build.gradle b/Crane/build.gradle
@@ -30,7 +30,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
@@ -34,7 +34,7 @@ object Libs {
     }
 
     object Accompanist {
-        const val version = "0.21.2-beta"
+        const val version = "0.21.3-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
 
@@ -60,7 +60,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta02"
+            const val version = "1.1.0-beta03"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -118,7 +118,7 @@ dependencies {
 
     implementation 'androidx.navigation:navigation-compose:2.4.0-beta02'
 
-    implementation "androidx.window:window:1.0.0-beta03"
+    implementation "androidx.window:window:1.0.0-beta04"
 
     androidTestImplementation 'androidx.test:core:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
diff --git a/JetNews/build.gradle b/JetNews/build.gradle
@@ -16,9 +16,9 @@
 
 buildscript {
     ext.kotlin_version = '1.5.31'
-    ext.compose_version = '1.1.0-beta02'
+    ext.compose_version = '1.1.0-beta03'
     ext.coroutines_version = '1.5.2'
-    ext.accompanist_version = '0.21.2-beta'
+    ext.accompanist_version = '0.21.3-beta'
 
     repositories {
         google()
@@ -32,7 +32,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt
@@ -23,7 +23,7 @@ import androidx.core.view.WindowCompat
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoRepository.Companion.windowInfoRepository
+import androidx.window.layout.WindowInfoTracker.Companion.getOrCreate
 import com.example.jetcaster.ui.theme.JetcasterTheme
 import com.example.jetcaster.util.DevicePosture
 import com.example.jetcaster.util.isBookPosture
@@ -43,7 +43,7 @@ class MainActivity : ComponentActivity() {
         /**
          * Flow of [DevicePosture] that emits every time there's a change in the windowLayoutInfo
          */
-        val devicePosture = windowInfoRepository().windowLayoutInfo
+        val devicePosture = getOrCreate(this).windowLayoutInfo(this)
             .flowWithLifecycle(this.lifecycle)
             .map { layoutInfo ->
                 val foldingFeature =
diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle
@@ -30,7 +30,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
diff --git a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
@@ -25,7 +25,7 @@ object Libs {
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 
     object Accompanist {
-        const val version = "0.21.2-beta"
+        const val version = "0.21.3-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
         const val pager = "com.google.accompanist:accompanist-pager:$version"
     }
@@ -71,7 +71,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta02"
+            const val version = "1.1.0-beta03"
 
             @get:JvmStatic
             val snapshotUrl: String
@@ -120,7 +120,7 @@ object Libs {
         }
 
         object Window {
-            const val window = "androidx.window:window:1.0.0-beta02"
+            const val window = "androidx.window:window:1.0.0-beta04"
         }
     }
 
diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle
@@ -32,7 +32,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
diff --git a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt
@@ -29,7 +29,7 @@ object Libs {
     const val material3 = "com.google.android.material:material:1.5.0-alpha05"
 
     object Accompanist {
-        const val version = "0.21.2-beta"
+        const val version = "0.21.3-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
 
@@ -57,7 +57,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta02"
+            const val version = "1.1.0-beta03"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
diff --git a/Jetsnack/build.gradle b/Jetsnack/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
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
@@ -24,7 +24,7 @@ object Libs {
     const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
 
     object Accompanist {
-        const val version = "0.21.2-beta"
+        const val version = "0.21.3-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
         const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
         const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version"
@@ -49,7 +49,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta02"
+            const val version = "1.1.0-beta03"
 
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
@@ -29,7 +29,7 @@ object Libs {
     const val material = "com.google.android.material:material:1.3.0"
 
     object Accompanist {
-        const val version = "0.21.2-beta"
+        const val version = "0.21.3-beta"
         const val permissions = "com.google.accompanist:accompanist-permissions:$version"
     }
 
@@ -63,7 +63,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta02"
+            const val version = "1.1.0-beta03"
 
             @get:JvmStatic
             val snapshotUrl: String
diff --git a/Owl/build.gradle b/Owl/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.17.1'
+    id 'com.diffplug.spotless' version '6.0.0'
 }
 
 subprojects {
diff --git a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt
@@ -24,7 +24,7 @@ object Libs {
     const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
 
     object Accompanist {
-        const val version = "0.21.2-beta"
+        const val version = "0.21.3-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
 
@@ -57,7 +57,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta02"
+            const val version = "1.1.0-beta03"
 
             const val animation = "androidx.compose.animation:animation:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ buildscript {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`plugins {`
`33`		`- id 'com.diffplug.spotless' version '5.17.1'`
	`33`	`+ id 'com.diffplug.spotless' version '6.0.0'`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ object Libs {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`object Accompanist {`
`37`		`- const val version = "0.21.2-beta"`
	`37`	`+ const val version = "0.21.3-beta"`
`38`	`38`	`const val insets = "com.google.accompanist:accompanist-insets:$version"`
`39`	`39`	`}`
`40`	`40`
`@@ -60,7 +60,7 @@ object Libs {`
`60`	`60`
`61`	`61`	`object Compose {`
`62`	`62`	`const val snapshot = ""`
`63`		`- const val version = "1.1.0-beta02"`
	`63`	`+ const val version = "1.1.0-beta03"`
`64`	`64`
`65`	`65`	`const val runtime = "androidx.compose.runtime:runtime:$version"`
`66`	`66`	`const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ object Libs {`
`25`	`25`	`const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"`
`26`	`26`
`27`	`27`	`object Accompanist {`
`28`		`- const val version = "0.21.2-beta"`
	`28`	`+ const val version = "0.21.3-beta"`
`29`	`29`	`const val insets = "com.google.accompanist:accompanist-insets:$version"`
`30`	`30`	`const val pager = "com.google.accompanist:accompanist-pager:$version"`
`31`	`31`	`}`
`@@ -71,7 +71,7 @@ object Libs {`
`71`	`71`
`72`	`72`	`object Compose {`
`73`	`73`	`const val snapshot = ""`
`74`		`- const val version = "1.1.0-beta02"`
	`74`	`+ const val version = "1.1.0-beta03"`
`75`	`75`
`76`	`76`	`@get:JvmStatic`
`77`	`77`	`val snapshotUrl: String`
`@@ -120,7 +120,7 @@ object Libs {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`object Window {`
`123`		`- const val window = "androidx.window:window:1.0.0-beta02"`
	`123`	`+ const val window = "androidx.window:window:1.0.0-beta04"`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ buildscript {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`plugins {`
`35`		`- id 'com.diffplug.spotless' version '5.17.1'`
	`35`	`+ id 'com.diffplug.spotless' version '6.0.0'`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ buildscript {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`plugins {`
`32`		`- id 'com.diffplug.spotless' version '5.17.1'`
	`32`	`+ id 'com.diffplug.spotless' version '6.0.0'`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`subprojects {`