Merge pull request #585 from android/dev_rc01

JoseAlcerreca · web-flow · commit ef5b972bdeff · 2021-07-01T20:47:19.000+02:00
[All] Update to Compose 1.0.0-rc01
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
@@ -21,6 +21,9 @@ object Versions {
 }
 
 object Libs {
+    // FIXME Hilt currently incompatible with AGP 7.0.0-beta04
+    // https://github.com/google/dagger/issues/2337
+    // https://github.com/google/dagger/issues/2700
     const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
 
@@ -34,7 +37,7 @@ object Libs {
     }
 
     object Accompanist {
-        const val version = "0.12.0"
+        const val version = "0.13.0"
         const val coil = "com.google.accompanist:accompanist-coil:$version"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
@@ -54,14 +57,14 @@ object Libs {
 
     object AndroidX {
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
         }
 
         const val appcompat = "androidx.appcompat:appcompat:1.3.0"
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta09"
+            const val version = "1.0.0-rc01"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -92,7 +95,7 @@ object Libs {
     }
 
     object Hilt {
-        private const val version = "2.36"
+        private const val version = "2.37"
 
         const val gradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:$version"
         const val android = "com.google.dagger:hilt-android:$version"
diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -91,14 +91,14 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.activity:activity-ktx:1.2.3'
-    implementation 'androidx.core:core-ktx:1.6.0-beta02'
-    implementation "androidx.activity:activity-compose:1.3.0-beta02"
+    implementation 'androidx.core:core-ktx:1.6.0-rc01'
+    implementation "androidx.activity:activity-compose:1.3.0-rc01"
 
     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-alpha07"
 
-    implementation 'androidx.navigation:navigation-compose:2.4.0-alpha03'
+    implementation 'androidx.navigation:navigation-compose:2.4.0-alpha04'
 
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'
diff --git a/JetNews/build.gradle b/JetNews/build.gradle
@@ -16,17 +16,17 @@
 
 buildscript {
     ext.kotlin_version = '1.5.10'
-    ext.compose_version = '1.0.0-beta09'
+    ext.compose_version = '1.0.0-rc01'
     ext.coroutines_version = '1.4.2'
-    ext.accompanist_version = '0.12.0'
+    ext.accompanist_version = '0.13.0'
 
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-beta03'
+        classpath 'com.android.tools.build:gradle:7.0.0-beta04'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
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
@@ -21,11 +21,11 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     object Accompanist {
-        const val version = "0.12.0"
+        const val version = "0.13.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,10 +60,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-beta02"
+        const val coreKtx = "androidx.core:core-ktx:1.6.0-rc01"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
         }
 
         object Constraint {
@@ -72,7 +72,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta09"
+            const val version = "1.0.0-rc01"
 
             @get:JvmStatic
             val snapshotUrl: String
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
@@ -21,15 +21,15 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.3.0"
 
     object Accompanist {
-        const val version = "0.12.0"
+        const val version = "0.13.0"
         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-beta02"
+        const val coreKtx = "androidx.core:core-ktx:1.6.0-rc01"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
         }
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta09"
+            const val version = "1.0.0-rc01"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
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,10 +21,10 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
 
     object Accompanist {
-        const val version = "0.12.0"
+        const val version = "0.13.0"
         const val coil = "com.google.accompanist:accompanist-coil:$version"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
         const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
@@ -49,7 +49,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta09"
+            const val version = "1.0.0-rc01"
 
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -64,7 +64,7 @@ object Libs {
         }
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
         }
 
         object Lifecycle {
@@ -73,12 +73,12 @@ object Libs {
         }
 
         object Navigation {
-            const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha03"
+            const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha04"
         }
 
         object ConstraintLayout {
             const val constraintLayoutCompose =
-                "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha07"
+                "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha08"
         }
 
         object Test {
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
@@ -21,15 +21,15 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.3.0"
 
     object Accompanist {
-        const val version = "0.12.0"
+        const val version = "0.13.0"
         const val coil = "com.google.accompanist:accompanist-coil:$version"
         const val permissions = "com.google.accompanist:accompanist-permissions:$version"
     }
@@ -59,12 +59,12 @@ object Libs {
         }
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
         }
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta09"
+            const val version = "1.0.0-rc01"
 
             @get:JvmStatic
             val snapshotUrl: String
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
@@ -21,10 +21,10 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
 
     object Accompanist {
-        const val version = "0.12.0"
+        const val version = "0.13.0"
         const val coil = "com.google.accompanist:accompanist-coil:$version"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
@@ -49,16 +49,16 @@ object Libs {
     }
 
     object AndroidX {
-        const val coreKtx = "androidx.core:core-ktx:1.6.0-beta02"
-        const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha03"
+        const val coreKtx = "androidx.core:core-ktx:1.6.0-rc01"
+        const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha04"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
         }
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta09"
+            const val version = "1.0.0-rc01"
 
             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
`@@ -16,17 +16,17 @@`
`16`	`16`
`17`	`17`	`buildscript {`
`18`	`18`	`ext.kotlin_version = '1.5.10'`
`19`		`- ext.compose_version = '1.0.0-beta09'`
	`19`	`+ ext.compose_version = '1.0.0-rc01'`
`20`	`20`	`ext.coroutines_version = '1.4.2'`
`21`		`- ext.accompanist_version = '0.12.0'`
	`21`	`+ ext.accompanist_version = '0.13.0'`
`22`	`22`
`23`	`23`	`repositories {`
`24`	`24`	`google()`
`25`	`25`	`mavenCentral()`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`dependencies {`
`29`		`- classpath 'com.android.tools.build:gradle:7.0.0-beta03'`
	`29`	`+ classpath 'com.android.tools.build:gradle:7.0.0-beta04'`
`30`	`30`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ object Versions {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`object Libs {`
`24`		`- const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"`
	`24`	`+ const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"`
`25`	`25`
`26`	`26`	`object Accompanist {`
`27`		`- const val version = "0.12.0"`
	`27`	`+ const val version = "0.13.0"`
`28`	`28`	`const val coil = "com.google.accompanist:accompanist-coil:$version"`
`29`	`29`	`const val insets = "com.google.accompanist:accompanist-insets:$version"`
`30`	`30`	`const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"`
`@@ -49,7 +49,7 @@ object Libs {`
`49`	`49`
`50`	`50`	`object Compose {`
`51`	`51`	`const val snapshot = ""`
`52`		`- const val version = "1.0.0-beta09"`
	`52`	`+ const val version = "1.0.0-rc01"`
`53`	`53`
`54`	`54`	`const val foundation = "androidx.compose.foundation:foundation:${version}"`
`55`	`55`	`const val layout = "androidx.compose.foundation:foundation-layout:${version}"`
`@@ -64,7 +64,7 @@ object Libs {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`object Activity {`
`67`		`- const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"`
	`67`	`+ const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`object Lifecycle {`
`@@ -73,12 +73,12 @@ object Libs {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`object Navigation {`
`76`		`- const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha03"`
	`76`	`+ const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha04"`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`object ConstraintLayout {`
`80`	`80`	`const val constraintLayoutCompose =`
`81`		`- "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha07"`
	`81`	`+ "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha08"`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`object Test {`