Update main | Compose 1.2.1 | Compiler 1.3.0 | Kotlin 1.7.10 (#924)

* Update versions * Address review comments
android · Aug 12, 2022 · c739be3 · c739be3
1 parent 0589ee1
commit c739be3
Show file tree

Hide file tree

Showing 17 changed files with 231 additions and 93 deletions.
diff --git a/Crane/app/build.gradle b/Crane/app/build.gradle
@@ -104,7 +104,7 @@ android {
 
 dependencies {
     implementation Libs.Kotlin.stdlib
-    implementation Libs.Kotlin.Coroutines.android
+    implementation Libs.Coroutines.android
     implementation Libs.GoogleMaps.maps
     implementation Libs.GoogleMaps.composeMaps
     constraints {
@@ -144,7 +144,7 @@ dependencies {
     androidTestImplementation Libs.AndroidX.Test.espressoCore
     androidTestImplementation Libs.AndroidX.Test.rules
     androidTestImplementation Libs.AndroidX.Test.Ext.junit
-    androidTestImplementation Libs.Kotlin.Coroutines.test
+    androidTestImplementation Libs.Coroutines.test
     androidTestImplementation Libs.AndroidX.Compose.uiTest
     androidTestImplementation Libs.Hilt.android
     androidTestImplementation Libs.Hilt.testing

diff --git a/Crane/build.gradle b/Crane/build.gradle
@@ -42,6 +42,9 @@ subprojects {
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
             maven { url Urls.composeSnapshotRepo }
         }
+        if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
+            maven { url Urls.composeCompilerSnapshotRepo }
+        }
     }
 
     apply plugin: 'com.diffplug.spotless'

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,7 +21,7 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
     const val secretsGradlePlugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktlint}"
 
@@ -37,16 +37,16 @@ object Libs {
     }
 
     object Kotlin {
-        private const val version = "1.7.0"
+        private const val version = "1.7.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
+    }
 
-        object Coroutines {
-            private const val version = "1.6.0"
-            const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
-            const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
-        }
+    object Coroutines {
+        private const val version = "1.6.0"
+        const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
+        const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
     }
 
     object AndroidX {
@@ -57,9 +57,10 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.4.1"
 
         object Compose {
-            const val compilerVersion = "1.2.0"
+            const val compilerSnapshot = ""
+            const val compilerVersion = "1.3.0"
             const val snapshot = ""
-            const val version = "1.2.0"
+            const val version = "1.2.1"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -125,4 +126,6 @@ object Urls {
     const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
     const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
         "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
+    const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+        "${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
 }
diff --git a/JetNews/build.gradle b/JetNews/build.gradle
@@ -15,9 +15,10 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.7.0'
-    ext.compose_compiler_version = '1.2.0'
-    ext.compose_version = '1.2.0'
+    ext.kotlin_version = '1.7.10'
+    ext.compose_compiler_version = '1.3.0'
+    ext.compose_compiler_snapshot_version = ''
+    ext.compose_version = '1.2.1'
     ext.compose_snapshot_version = ''
     ext.coroutines_version = '1.6.0'
     ext.accompanist_version = '0.25.1'
@@ -47,6 +48,10 @@ subprojects {
             maven { url "https://androidx.dev/snapshots/builds/" +
                     "${compose_snapshot_version}/artifacts/repository/" }
         }
+        if (!compose_compiler_snapshot_version.isEmpty()) {
+            maven { url "https://androidx.dev/snapshots/builds/" +
+                    "${compose_compiler_snapshot_version}/artifacts/repository/" }
+        }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 

diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle
@@ -15,6 +15,7 @@
  */
 
 import com.example.jetcaster.buildsrc.Libs
+import com.example.jetcaster.buildsrc.Urls
 import com.example.jetcaster.buildsrc.Versions
 
 buildscript {
@@ -42,6 +43,9 @@ subprojects {
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
             maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
         }
+        if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
+            maven { url Urls.composeCompilerSnapshotRepo }
+        }
         if (Libs.Accompanist.version.endsWith('SNAPSHOT')) {
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         }

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,16 +21,16 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 
     object Accompanist {
-        const val version = "0.25.0"
+        const val version = "0.25.1"
         const val pager = "com.google.accompanist:accompanist-pager:$version"
     }
 
     object Kotlin {
-        private const val version = "1.7.0"
+        private const val version = "1.7.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -69,13 +69,10 @@ object Libs {
         }
 
         object Compose {
-            const val compilerVersion = "1.2.0"
+            const val compilerSnapshot = ""
+            const val compilerVersion = "1.3.0"
             const val snapshot = ""
-            const val version = "1.2.0"
-
-            @get:JvmStatic
-            val snapshotUrl: String
-                get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
+            const val version = "1.2.1"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"
@@ -135,3 +132,11 @@ object Libs {
         const val coilCompose = "io.coil-kt:coil-compose:2.0.0"
     }
 }
+
+object Urls {
+    const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
+    const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
+    const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
+}
diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle
@@ -46,6 +46,9 @@ subprojects {
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
             maven { url Urls.composeSnapshotRepo }
         }
+        if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
+            maven { url Urls.composeCompilerSnapshotRepo }
+        }
     }
 
     apply plugin: 'com.diffplug.spotless'

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.2.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 
     const val junit = "junit:junit:4.13"
 
     const val material3 = "com.google.android.material:material:1.6.0-alpha03"
 
     object Kotlin {
-        private const val version = "1.7.0"
+        private const val version = "1.7.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -51,9 +51,10 @@ object Libs {
         }
 
         object Compose {
-            const val compilerVersion = "1.2.0"
+            const val compilerSnapshot = ""
+            const val compilerVersion = "1.3.0"
             const val snapshot = ""
-            const val version = "1.2.0"
+            const val version = "1.2.1"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -110,6 +111,8 @@ object Libs {
 object Urls {
     const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
         "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
+    const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
     const val composeMaterial3SnapshotRepo = "https://androidx.dev/snapshots/builds/" +
             "${Libs.AndroidX.Compose.Material3.snapshot}/artifacts/repository/"
     const val accompanistSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots"

diff --git a/Jetsnack/build.gradle b/Jetsnack/build.gradle
@@ -15,6 +15,7 @@
  */
 
 import com.example.jetsnack.buildsrc.Libs
+import com.example.jetsnack.buildsrc.Urls
 import com.example.jetsnack.buildsrc.Versions
 
 buildscript {
@@ -42,6 +43,9 @@ subprojects {
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
             maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
         }
+        if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
+            maven { url Urls.composeCompilerSnapshotRepo }
+        }
         if (Libs.Accompanist.version.endsWith("SNAPSHOT")) {
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         }

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,16 +21,16 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
 
     object Accompanist {
-        const val version = "0.25.0"
+        const val version = "0.25.1"
         const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
         const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version"
     }
 
     object Kotlin {
-        private const val version = "1.7.0"
+        private const val version = "1.7.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -47,9 +47,10 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.7.0"
 
         object Compose {
-            const val compilerVersion = "1.2.0"
+            const val compilerSnapshot = ""
+            const val compilerVersion = "1.3.0"
             const val snapshot = ""
-            const val version = "1.2.0"
+            const val version = "1.2.1"
 
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -105,3 +106,11 @@ object Libs {
         const val coilCompose = "io.coil-kt:coil-compose:2.0.0"
     }
 }
+
+object Urls {
+    const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
+    const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
+    const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.compilerSnapshot}/artifacts/repository/"
+}
diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle
@@ -15,6 +15,7 @@
  */
 
 import com.example.compose.jetsurvey.buildsrc.Libs
+import com.example.compose.jetsurvey.buildsrc.Urls
 import com.example.compose.jetsurvey.buildsrc.Versions
 
 buildscript {
@@ -38,7 +39,10 @@ subprojects {
         mavenCentral()
 
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
-            maven { url Libs.AndroidX.Compose.snapshotUrl }
+            maven { url Urls.composeSnapshotRepo }
+        }
+        if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
+            maven { url Urls.composeCompilerSnapshotRepo }
         }
         if (Libs.Accompanist.version.endsWith('SNAPSHOT')) {
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }

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,18 +21,18 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 
     const val junit = "junit:junit:4.13.2"
 
     object Accompanist {
-        const val version = "0.25.0"
+        const val version = "0.25.1"
         const val permissions = "com.google.accompanist:accompanist-permissions:$version"
     }
 
     object Kotlin {
-        private const val version = "1.7.0"
+        private const val version = "1.7.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -60,13 +60,10 @@ object Libs {
         }
 
         object Compose {
-            const val compilerVersion = "1.2.0"
+            const val compilerSnapshot = ""
+            const val compilerVersion = "1.3.0"
             const val snapshot = ""
-            const val version = "1.2.0"
-
-            @get:JvmStatic
-            val snapshotUrl: String
-                get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
+            const val version = "1.2.1"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -113,3 +110,11 @@ object Libs {
         const val robolectric = "org.robolectric:robolectric:4.5.1"
     }
 }
+
+object Urls {
+    const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
+    const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
+    const val composeCompilerSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+            "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
+}
diff --git a/Owl/build.gradle b/Owl/build.gradle
@@ -15,6 +15,7 @@
  */
 
 import com.example.owl.buildsrc.Libs
+import com.example.owl.buildsrc.Urls
 import com.example.owl.buildsrc.Versions
 
 buildscript {
@@ -38,7 +39,10 @@ subprojects {
         mavenCentral()
 
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
-            maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
+            maven { url Urls.composeSnapshotRepo }
+        }
+        if (!Libs.AndroidX.Compose.compilerSnapshot.isEmpty()) {
+            maven { url Urls.composeCompilerSnapshotRepo }
         }
     }