Merge pull request #697 from android/jv/v1.1.0-beta02

JolandaVerhoef · web-flow · commit 4ae43c166b33 · 2021-11-05T12:17:03.000Z
[All] Update to Compose 1.1.0-beta02
diff --git a/Crane/build.gradle b/Crane/build.gradle
@@ -30,7 +30,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 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
@@ -17,7 +17,7 @@
 package com.example.crane.buildsrc
 
 object Versions {
-    const val ktLint = "0.42.1"
+    const val ktLint = "0.43.0"
 }
 
 object Libs {
@@ -34,7 +34,7 @@ object Libs {
     }
 
     object Accompanist {
-        const val version = "0.21.0-beta"
+        const val version = "0.21.2-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
 
@@ -53,14 +53,14 @@ object Libs {
 
     object AndroidX {
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.1"
+            const val activityCompose = "androidx.activity:activity-compose:1.4.0"
         }
 
         const val appcompat = "androidx.appcompat:appcompat:1.3.0"
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta01"
+            const val version = "1.1.0-beta02"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -74,7 +74,7 @@ object Libs {
         }
 
         object Lifecycle {
-            private const val version = "2.4.0-rc01"
+            private const val version = "2.4.0"
             const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
             const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -107,17 +107,18 @@ dependencies {
     implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
 
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.activity:activity-ktx:1.3.1'
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation "androidx.activity:activity-compose:1.3.1"
+    implementation 'androidx.activity:activity-ktx:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation "androidx.activity:activity-compose:1.4.0"
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0"
 
-    implementation 'androidx.navigation:navigation-compose:2.4.0-alpha10'
+    implementation 'androidx.navigation:navigation-compose:2.4.0-beta02'
 
-    implementation "androidx.window:window:1.0.0-beta02"
+    implementation "androidx.window:window:1.0.0-beta03"
 
     androidTestImplementation 'androidx.test:core:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeViewModel.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeViewModel.kt
@@ -234,7 +234,7 @@ class HomeViewModel(
             postsRepository: PostsRepository,
         ): ViewModelProvider.Factory = object : ViewModelProvider.Factory {
             @Suppress("UNCHECKED_CAST")
-            override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
                 return HomeViewModel(postsRepository) as T
             }
         }
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsViewModel.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsViewModel.kt
@@ -129,7 +129,7 @@ class InterestsViewModel(
             interestsRepository: InterestsRepository,
         ): ViewModelProvider.Factory = object : ViewModelProvider.Factory {
             @Suppress("UNCHECKED_CAST")
-            override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
                 return InterestsViewModel(interestsRepository) as T
             }
         }
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-beta01'
+    ext.compose_version = '1.1.0-beta02'
     ext.coroutines_version = '1.5.2'
-    ext.accompanist_version = '0.21.0-beta'
+    ext.accompanist_version = '0.21.2-beta'
 
     repositories {
         google()
@@ -32,7 +32,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 subprojects {
@@ -48,7 +48,7 @@ subprojects {
             targetExclude("$buildDir/**/*.kt")
             targetExclude('bin/**/*.kt')
 
-            ktlint("0.41.0")
+            ktlint("0.43.0")
             licenseHeaderFile rootProject.file('spotless/copyright.kt')
         }
     }
diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt
@@ -81,7 +81,7 @@ class PlayerViewModel(
         ): AbstractSavedStateViewModelFactory =
             object : AbstractSavedStateViewModelFactory(owner, defaultArgs) {
                 @Suppress("UNCHECKED_CAST")
-                override fun <T : ViewModel?> create(
+                override fun <T : ViewModel> create(
                     key: String,
                     modelClass: Class<T>,
                     handle: SavedStateHandle
diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle
@@ -30,7 +30,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 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
@@ -17,15 +17,15 @@
 package com.example.jetcaster.buildsrc
 
 object Versions {
-    const val ktlint = "0.42.1"
+    const val ktlint = "0.43.0"
 }
 
 object Libs {
     const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 
     object Accompanist {
-        const val version = "0.21.0-beta"
+        const val version = "0.21.2-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
         const val pager = "com.google.accompanist:accompanist-pager:$version"
     }
@@ -59,10 +59,10 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.2.0"
         const val palette = "androidx.palette:palette:1.0.0"
 
-        const val coreKtx = "androidx.core:core-ktx:1.6.0"
+        const val coreKtx = "androidx.core:core-ktx:1.7.0"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.1"
+            const val activityCompose = "androidx.activity:activity-compose:1.4.0"
         }
 
         object Constraint {
@@ -71,7 +71,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta01"
+            const val version = "1.1.0-beta02"
 
             @get:JvmStatic
             val snapshotUrl: String
@@ -89,14 +89,14 @@ object Libs {
         }
 
         object Lifecycle {
-            private const val version = "2.4.0-rc01"
+            private const val version = "2.4.0"
             const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
             const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
 
         object Navigation {
-            const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha10"
+            const val navigation = "androidx.navigation:navigation-compose:2.4.0-beta02"
         }
 
         object Test {
diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle
@@ -32,7 +32,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 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
@@ -17,7 +17,7 @@
 package com.example.compose.jetchat.buildsrc
 
 object Versions {
-    const val ktlint = "0.42.1"
+    const val ktlint = "0.43.0"
 }
 
 object Libs {
@@ -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.0-beta"
+        const val version = "0.21.2-beta"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
 
@@ -49,15 +49,15 @@ object Libs {
 
     object AndroidX {
         const val appcompat = "androidx.appcompat:appcompat:1.3.0"
-        const val coreKtx = "androidx.core:core-ktx:1.6.0"
+        const val coreKtx = "androidx.core:core-ktx:1.7.0"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.1"
+            const val activityCompose = "androidx.activity:activity-compose:1.4.0"
         }
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta01"
+            const val version = "1.1.0-beta02"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -100,7 +100,7 @@ object Libs {
         }
 
         object Lifecycle {
-            private const val version = "2.4.0-rc01"
+            private const val version = "2.4.0"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
             const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/cart/CartViewModel.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/cart/CartViewModel.kt
@@ -90,7 +90,7 @@ class CartViewModel(
             snackRepository: SnackRepo = SnackRepo
         ): ViewModelProvider.Factory = object : ViewModelProvider.Factory {
             @Suppress("UNCHECKED_CAST")
-            override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
                 return CartViewModel(snackbarManager, snackRepository) as T
             }
         }
diff --git a/Jetsnack/build.gradle b/Jetsnack/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 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
@@ -17,14 +17,14 @@
 package com.example.jetsnack.buildsrc
 
 object Versions {
-    const val ktlint = "0.42.1"
+    const val ktlint = "0.43.0"
 }
 
 object Libs {
     const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
 
     object Accompanist {
-        const val version = "0.21.0-beta"
+        const val version = "0.21.2-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"
@@ -45,11 +45,11 @@ object Libs {
     }
 
     object AndroidX {
-        const val coreKtx = "androidx.core:core-ktx:1.6.0"
+        const val coreKtx = "androidx.core:core-ktx:1.7.0"
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta01"
+            const val version = "1.1.0-beta02"
 
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -64,15 +64,15 @@ object Libs {
         }
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.1"
+            const val activityCompose = "androidx.activity:activity-compose:1.4.0"
         }
 
         object Lifecycle {
             const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-rc01"
         }
 
         object Navigation {
-            const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha10"
+            const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-beta02"
         }
 
         object ConstraintLayout {
diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 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
@@ -17,7 +17,7 @@
 package com.example.compose.jetsurvey.buildsrc
 
 object Versions {
-    const val ktlint = "0.42.1"
+    const val ktlint = "0.43.0"
 }
 
 object Libs {
@@ -29,7 +29,7 @@ object Libs {
     const val material = "com.google.android.material:material:1.3.0"
 
     object Accompanist {
-        const val version = "0.21.0-beta"
+        const val version = "0.21.2-beta"
         const val permissions = "com.google.accompanist:accompanist-permissions:$version"
     }
 
@@ -49,21 +49,21 @@ object Libs {
 
     object AndroidX {
         const val appcompat = "androidx.appcompat:appcompat:1.3.0"
-        const val coreKtx = "androidx.core:core-ktx:1.6.0"
+        const val coreKtx = "androidx.core:core-ktx:1.7.0"
 
         object Lifecycle {
-            private const val version = "2.4.0-rc01"
+            private const val version = "2.4.0"
             const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.1"
+            const val activityCompose = "androidx.activity:activity-compose:1.4.0"
         }
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-beta01"
+            const val version = "1.1.0-beta02"
 
             @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.15.0'
+    id 'com.diffplug.spotless' version '5.17.1'
 }
 
 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

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.15.0'`
	`33`	`+ id 'com.diffplug.spotless' version '5.17.1'`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`package com.example.crane.buildsrc`
`18`	`18`
`19`	`19`	`object Versions {`
`20`		`- const val ktLint = "0.42.1"`
	`20`	`+ const val ktLint = "0.43.0"`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`object Libs {`
`@@ -34,7 +34,7 @@ object Libs {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`object Accompanist {`
`37`		`- const val version = "0.21.0-beta"`
	`37`	`+ const val version = "0.21.2-beta"`
`38`	`38`	`const val insets = "com.google.accompanist:accompanist-insets:$version"`
`39`	`39`	`}`
`40`	`40`
`@@ -53,14 +53,14 @@ object Libs {`
`53`	`53`
`54`	`54`	`object AndroidX {`
`55`	`55`	`object Activity {`
`56`		`- const val activityCompose = "androidx.activity:activity-compose:1.3.1"`
	`56`	`+ const val activityCompose = "androidx.activity:activity-compose:1.4.0"`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`const val appcompat = "androidx.appcompat:appcompat:1.3.0"`
`60`	`60`
`61`	`61`	`object Compose {`
`62`	`62`	`const val snapshot = ""`
`63`		`- const val version = "1.1.0-beta01"`
	`63`	`+ const val version = "1.1.0-beta02"`
`64`	`64`
`65`	`65`	`const val runtime = "androidx.compose.runtime:runtime:$version"`
`66`	`66`	`const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"`
`@@ -74,7 +74,7 @@ object Libs {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`object Lifecycle {`
`77`		`- private const val version = "2.4.0-rc01"`
	`77`	`+ private const val version = "2.4.0"`
`78`	`78`	`const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"`
`79`	`79`	`const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ class HomeViewModel(`
`234`	`234`	`postsRepository: PostsRepository,`
`235`	`235`	`): ViewModelProvider.Factory = object : ViewModelProvider.Factory {`
`236`	`236`	`@Suppress("UNCHECKED_CAST")`
`237`		`- override fun <T : ViewModel?> create(modelClass: Class<T>): T {`
	`237`	`+ override fun <T : ViewModel> create(modelClass: Class<T>): T {`
`238`	`238`	`return HomeViewModel(postsRepository) as T`
`239`	`239`	`}`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ class InterestsViewModel(`
`129`	`129`	`interestsRepository: InterestsRepository,`
`130`	`130`	`): ViewModelProvider.Factory = object : ViewModelProvider.Factory {`
`131`	`131`	`@Suppress("UNCHECKED_CAST")`
`132`		`- override fun <T : ViewModel?> create(modelClass: Class<T>): T {`
	`132`	`+ override fun <T : ViewModel> create(modelClass: Class<T>): T {`
`133`	`133`	`return InterestsViewModel(interestsRepository) as T`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@`
`16`	`16`
`17`	`17`	`buildscript {`
`18`	`18`	`ext.kotlin_version = '1.5.31'`
`19`		`- ext.compose_version = '1.1.0-beta01'`
	`19`	`+ ext.compose_version = '1.1.0-beta02'`
`20`	`20`	`ext.coroutines_version = '1.5.2'`
`21`		`- ext.accompanist_version = '0.21.0-beta'`
	`21`	`+ ext.accompanist_version = '0.21.2-beta'`
`22`	`22`
`23`	`23`	`repositories {`
`24`	`24`	`google()`
`@@ -32,7 +32,7 @@ buildscript {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`plugins {`
`35`		`- id 'com.diffplug.spotless' version '5.15.0'`
	`35`	`+ id 'com.diffplug.spotless' version '5.17.1'`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`subprojects {`
`@@ -48,7 +48,7 @@ subprojects {`
`48`	`48`	`targetExclude("$buildDir/*/.kt")`
`49`	`49`	`targetExclude('bin/*/.kt')`
`50`	`50`
`51`		`- ktlint("0.41.0")`
	`51`	`+ ktlint("0.43.0")`
`52`	`52`	`licenseHeaderFile rootProject.file('spotless/copyright.kt')`
`53`	`53`	`}`
`54`	`54`	`}`