Reverts Compose version to rc01, sets compiler to rc02, updates gradle

JoseAlcerreca · JoseAlcerreca · commit 50894a3bda09 · 2021-12-20T12:01:37.000Z
diff --git a/Crane/app/build.gradle b/Crane/app/build.gradle
@@ -91,7 +91,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03
     }
 
     packagingOptions {
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
@@ -60,7 +60,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-rc02"
+            const val version = "1.1.0-rc01"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
diff --git a/Crane/gradle/wrapper/gradle-wrapper.jar b/Crane/gradle/wrapper/gradle-wrapper.jar
diff --git a/Crane/gradle/wrapper/gradle-wrapper.properties b/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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Crane/gradlew b/Crane/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -79,7 +79,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03
     }
 
     packagingOptions {
diff --git a/JetNews/build.gradle b/JetNews/build.gradle
@@ -16,7 +16,7 @@
 
 buildscript {
     ext.kotlin_version = '1.6.10'
-    ext.compose_version = '1.1.0-rc02'
+    ext.compose_version = '1.1.0-rc01'
     ext.coroutines_version = '1.5.2'
     ext.accompanist_version = '0.22.0-rc'
 
diff --git a/JetNews/gradle/wrapper/gradle-wrapper.jar b/JetNews/gradle/wrapper/gradle-wrapper.jar
diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/JetNews/gradlew b/JetNews/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/Jetcaster/app/build.gradle b/Jetcaster/app/build.gradle
@@ -88,7 +88,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
     }
 }
 
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
@@ -71,7 +71,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-rc02"
+            const val version = "1.1.0-rc01"
 
             @get:JvmStatic
             val snapshotUrl: String
diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetchat/app/build.gradle b/Jetchat/app/build.gradle
@@ -78,7 +78,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
     }
 
     packagingOptions {
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
@@ -57,7 +57,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-rc02"
+            const val version = "1.1.0-rc01"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetsnack/app/build.gradle b/Jetsnack/app/build.gradle
@@ -71,7 +71,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
     }
 
     packagingOptions {
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
@@ -49,7 +49,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-rc02"
+            const val version = "1.1.0-rc01"
 
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
diff --git a/Jetsnack/gradle/wrapper/gradle-wrapper.properties b/Jetsnack/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetsurvey/app/build.gradle b/Jetsurvey/app/build.gradle
@@ -75,7 +75,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
     }
 
     packagingOptions {
diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle
@@ -73,12 +73,4 @@ subprojects {
             jvmTarget = "1.8"
         }
     }
-    // Forcing to use the snapshot version
-    configurations.configureEach {
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group.startsWith('androidx.compose')) {
-                details.useVersion Libs.AndroidX.Compose.version
-            }
-        }
-    }
 }
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
@@ -34,7 +34,7 @@ object Libs {
     }
 
     object Kotlin {
-        private const val version = "1.6.1"
+        private const val version = "1.6.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"
@@ -63,7 +63,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-rc02"
+            const val version = "1.1.0-rc01"
 
             @get:JvmStatic
             val snapshotUrl: String
diff --git a/Jetsurvey/gradle/wrapper/gradle-wrapper.jar b/Jetsurvey/gradle/wrapper/gradle-wrapper.jar
diff --git a/Jetsurvey/gradle/wrapper/gradle-wrapper.properties b/Jetsurvey/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Jetsurvey/gradlew b/Jetsurvey/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/Owl/app/build.gradle b/Owl/app/build.gradle
@@ -70,7 +70,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
     }
 
     packagingOptions {
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
@@ -57,7 +57,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.1.0-rc02"
+            const val version = "1.1.0-rc01"
 
             const val animation = "androidx.compose.animation:animation:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"
diff --git a/Owl/gradle/wrapper/gradle-wrapper.properties b/Owl/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ android {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`composeOptions {`
`94`		`- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version`
	`94`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ android {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`composeOptions {`
`82`		`- kotlinCompilerExtensionVersion compose_version`
	`82`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ android {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`composeOptions {`
`91`		`- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version`
	`91`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ android {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`composeOptions {`
`81`		`- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version`
	`81`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ android {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`composeOptions {`
`74`		`- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version`
	`74`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ android {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`composeOptions {`
`78`		`- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version`
	`78`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,4 @@ subprojects {`
`73`	`73`	`jvmTarget = "1.8"`
`74`	`74`	`}`
`75`	`75`	`}`
`76`		`- // Forcing to use the snapshot version`
`77`		`- configurations.configureEach {`
`78`		`- resolutionStrategy.eachDependency { details ->`
`79`		`- if (details.requested.group.startsWith('androidx.compose')) {`
`80`		`- details.useVersion Libs.AndroidX.Compose.version`
`81`		`- }`
`82`		`- }`
`83`		`- }`
`84`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ android {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`composeOptions {`
`73`		`- kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version`
	`73`	`+ kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`packagingOptions {`