[All] Update to Compose 1.0.0-beta07 (#517)

Author: chrisbanes

Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

@@ -30,7 +30,7 @@ object Libs {
  }
 
  object Accompanist {
- const val version = "0.9.0"
+ const val version = "0.10.0"
  const val coil = "com.google.accompanist:accompanist-coil:$version"
  const val insets = "com.google.accompanist:accompanist-insets:$version"
  }
@@ -50,14 +50,14 @@ object Libs {
 
  object AndroidX {
  object Activity {
- const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha07"
+ const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha08"
  }
 
- const val appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"
+ const val appcompat = "androidx.appcompat:appcompat:1.3.0"
 
  object Compose {
  const val snapshot = ""
- const val version = "1.0.0-beta06"
+ const val version = "1.0.0-beta07"
 
  const val runtime = "androidx.compose.runtime:runtime:$version"
  const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -71,7 +71,7 @@ object Libs {
 
  object Lifecycle {
  private const val version = "2.3.1"
- const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
+ const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha05"
  const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
  }
 

Crane/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

JetNews/app/build.gradle

@@ -90,20 +90,20 @@ dependencies {
  implementation "androidx.compose.ui:ui-tooling:$compose_version"
  implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
 
- implementation "com.google.accompanist:accompanist-swiperefresh:0.8.1"
- implementation "com.google.accompanist:accompanist-insets:0.8.1"
- implementation "com.google.accompanist:accompanist-systemuicontroller:0.8.1"
+ implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
+ implementation "com.google.accompanist:accompanist-insets:$accompanist_version"
+ implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
 
- implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
+ implementation 'androidx.appcompat:appcompat:1.3.0'
  implementation 'androidx.activity:activity-ktx:1.2.2'
  implementation 'androidx.core:core-ktx:1.6.0-alpha02'
- implementation "androidx.activity:activity-compose:1.3.0-alpha07"
+ implementation "androidx.activity:activity-compose:1.3.0-alpha08"
 
  implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"
  implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha05"
 
- implementation "androidx.navigation:navigation-compose:1.0.0-alpha10"
+ implementation "androidx.navigation:navigation-compose:2.4.0-alpha01"
 
  androidTestImplementation 'androidx.test:rules:1.3.0'
  androidTestImplementation 'androidx.test:runner:1.3.0'

JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsApp.kt

@@ -23,9 +23,7 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.Color
-import androidx.navigation.compose.KEY_ROUTE
 import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.navigation.compose.navigate
 import androidx.navigation.compose.rememberNavController
 import com.example.jetnews.data.AppContainer
 import com.example.jetnews.ui.theme.JetnewsTheme
@@ -52,8 +50,7 @@ fun JetnewsApp(
  val scaffoldState = rememberScaffoldState()
 
  val navBackStackEntry by navController.currentBackStackEntryAsState()
- val currentRoute = navBackStackEntry?.arguments?.getString(KEY_ROUTE)
- ?: MainDestinations.HOME_ROUTE
+ val currentRoute = navBackStackEntry?.destination?.route ?: MainDestinations.HOME_ROUTE
  Scaffold(
  scaffoldState = scaffoldState,
  drawerContent = {

JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsNavGraph.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigate
 import androidx.navigation.compose.rememberNavController
 import com.example.jetnews.data.AppContainer
 import com.example.jetnews.ui.MainDestinations.ARTICLE_ID_KEY

JetNews/build.gradle

@@ -16,11 +16,13 @@
 
 buildscript {
  ext.kotlin_version = '1.4.32'
- ext.compose_version = '1.0.0-beta06'
+ ext.compose_version = '1.0.0-beta07'
  ext.coroutines_version = '1.4.2'
+ ext.accompanist_version = '0.10.0'
 
  repositories {
  google()
+ mavenCentral()
  jcenter()
  }
 
@@ -37,6 +39,7 @@ plugins {
 subprojects {
  repositories {
  google()
+ mavenCentral()
  jcenter()
  }
 
@@ -47,7 +50,7 @@ subprojects {
  targetExclude("$buildDir/**/*.kt")
  targetExclude('bin/**/*.kt')
 
- ktlint("0.40.0")
+ ktlint("0.41.0")
  licenseHeaderFile rootProject.file('spotless/copyright.kt')
  }
  }

JetNews/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Jetcaster/build.gradle

@@ -20,6 +20,7 @@ import com.example.jetcaster.buildsrc.Versions
 buildscript {
  repositories {
  google()
+ mavenCentral()
  jcenter()
  }
 

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.0.9"
 
  object Accompanist {
- const val version = "0.9.0"
+ const val version = "0.10.0"
  const val coil = "com.google.accompanist:accompanist-coil:$version"
  const val insets = "com.google.accompanist:accompanist-insets:$version"
  const val pager = "com.google.accompanist:accompanist-pager:$version"
@@ -60,19 +60,19 @@ 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-alpha01"
+ const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha03"
 
  object Activity {
- const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha07"
+ const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha08"
  }
 
  object Constraint {
- const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha05"
+ const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha07"
  }
 
  object Compose {
  const val snapshot = ""
- const val version = "1.0.0-beta06"
+ const val version = "1.0.0-beta07"
 
  @get:JvmStatic
  val snapshotUrl: String
@@ -91,7 +91,7 @@ object Libs {
 
  object Lifecycle {
  private const val version = "2.3.1"
- const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
+ const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha05"
  const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
  }
 

Jetcaster/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists