From ab3cc79b408a4c93c1ea84d52456c7ad68f1b71f Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Wed, 7 Apr 2021 20:48:43 +0100 Subject: [PATCH] [All] Update to beta04. Change-Id: I8edf7010dc712b4bc9c7ba83155a382fc6e213a3 --- .../java/com/example/crane/buildsrc/Dependencies.kt | 10 +++++----- JetNews/app/build.gradle | 4 ++-- JetNews/build.gradle | 4 ++-- .../com/example/jetcaster/buildsrc/dependencies.kt | 10 +++++----- .../example/compose/jetchat/buildsrc/dependencies.kt | 10 +++++----- .../java/com/example/jetsnack/buildsrc/Dependencies.kt | 10 +++++----- .../example/compose/jetsurvey/buildsrc/dependencies.kt | 10 +++++----- .../main/java/com/example/owl/buildsrc/Dependencies.kt | 10 +++++----- .../com/example/compose/rally/buildsrc/dependencies.kt | 6 +++--- 9 files changed, 37 insertions(+), 37 deletions(-) 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 index 362cbbe971..997ef36e21 100644 --- a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt +++ b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt @@ -30,7 +30,7 @@ object Libs { } object Accompanist { - private const val version = "0.7.1.compose-7262094-SNAPSHOT" + private const val version = "0.7.1" const val coil = "com.google.accompanist:accompanist-coil:$version" } @@ -49,14 +49,14 @@ object Libs { object AndroidX { object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } const val appcompat = "androidx.appcompat:appcompat:1.3.0-rc01" object Compose { - const val snapshot = "7262094" - private const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + private const val version = "1.0.0-beta04" const val runtime = "androidx.compose.runtime:runtime:$version" const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version" @@ -70,7 +70,7 @@ object Libs { object Lifecycle { private const val version = "2.3.1" - const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT" + const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04" const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version" } diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle index cb5b86ea42..abb5e16d52 100644 --- a/JetNews/app/build.gradle +++ b/JetNews/app/build.gradle @@ -93,11 +93,11 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.0-rc01' implementation 'androidx.activity:activity-ktx:1.2.2' implementation 'androidx.core:core-ktx:1.6.0-alpha01' - implementation "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + implementation "androidx.activity:activity-compose:1.3.0-alpha06" implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.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 index b284016e9a..e9d66178bb 100644 --- a/JetNews/build.gradle +++ b/JetNews/build.gradle @@ -16,7 +16,7 @@ buildscript { ext.kotlin_version = '1.4.32' - ext.compose_version = '1.0.0-SNAPSHOT' + ext.compose_version = '1.0.0-beta04' ext.coroutines_version = '1.4.2' repositories { @@ -25,7 +25,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-alpha11' + classpath 'com.android.tools.build:gradle:7.0.0-alpha12' 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 index dc51bed4b5..84e4769a04 100644 --- a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt +++ b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt @@ -27,7 +27,7 @@ object Libs { const val material = "com.google.android.material:material:1.3.0" object Accompanist { - private const val version = "0.7.1.compose-7262094-SNAPSHOT" + private const val version = "0.7.1" 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" @@ -65,7 +65,7 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01" object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } object Constraint { @@ -73,8 +73,8 @@ object Libs { } object Compose { - private const val snapshot = "7262094" - private const val version = "1.0.0-SNAPSHOT" + private const val snapshot = "" + private const val version = "1.0.0-beta04" @get:JvmStatic val snapshotUrl: String @@ -93,7 +93,7 @@ object Libs { object Lifecycle { private const val version = "2.3.1" - const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT" + const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04" const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version" } 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 index 01f65dc4e4..c77d8c5e69 100644 --- 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 @@ -43,7 +43,7 @@ object Libs { } object Accompanist { - private const val version = "0.7.1.compose-7262094-SNAPSHOT" + private const val version = "0.7.1" const val insets = "com.google.accompanist:accompanist-insets:$version" } @@ -52,12 +52,12 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01" object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } object Compose { - const val snapshot = "7262094" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-beta04" const val foundation = "androidx.compose.foundation:foundation:$version" const val layout = "androidx.compose.foundation:foundation-layout:$version" @@ -96,7 +96,7 @@ object Libs { 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" - const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT" + const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04" } } } 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 index a35776e787..0c6adb9337 100644 --- 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.0-alpha12" object Accompanist { - const val version = "0.7.1.compose-7262094-SNAPSHOT" + const val version = "0.7.1" const val coil = "com.google.accompanist:accompanist-coil:$version" const val insets = "com.google.accompanist:accompanist-insets:$version" } @@ -47,8 +47,8 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01" object Compose { - const val snapshot = "7262094" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-beta04" const val foundation = "androidx.compose.foundation:foundation:${version}" const val layout = "androidx.compose.foundation:foundation-layout:${version}" @@ -63,12 +63,12 @@ object Libs { } object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } object Lifecycle { const val viewModelCompose = - "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT" + "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04" } object ConstraintLayout { 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 index 97bc40998f..aa952def89 100644 --- 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 { - private const val version = "0.7.1.compose-7262094-SNAPSHOT" + private const val version = "0.7.1" const val coil = "com.google.accompanist:accompanist-coil:$version" } @@ -53,17 +53,17 @@ object Libs { object Lifecycle { private const val version = "2.3.1" - const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT" + const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04" const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version" } object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } object Compose { - const val snapshot = "7262094" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-beta04" @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 index f047fff3e2..f2aba41aed 100644 --- 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.0-alpha12" object Accompanist { - const val version = "0.7.1.compose-7262094-SNAPSHOT" + const val version = "0.7.1" const val coil = "com.google.accompanist:accompanist-coil:$version" const val insets = "com.google.accompanist:accompanist-insets:$version" } @@ -50,11 +50,11 @@ object Libs { object AndroidX { const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01" - const val navigation = "androidx.navigation:navigation-compose:1.0.0-SNAPSHOT" + const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha10" object Compose { - const val snapshot = "7262094" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-beta04" const val animation = "androidx.compose.animation:animation:$version" const val foundation = "androidx.compose.foundation:foundation:$version" @@ -69,7 +69,7 @@ object Libs { } object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } object ConstraintLayout { diff --git a/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt b/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt index 25dfe4f455..d67768acbb 100644 --- a/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt +++ b/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt @@ -45,12 +45,12 @@ object Libs { const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01" object Activity { - const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT" + const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha06" } object Compose { - const val snapshot = "7262094" - const val version = "1.0.0-SNAPSHOT" + const val snapshot = "" + const val version = "1.0.0-beta04" const val core = "androidx.compose.ui:ui:$version" const val foundation = "androidx.compose.foundation:foundation:$version"