Merge pull request #927 from google/ja/compose_1.1.0-rc02

Kotlin 1.6.10 release v0.22.0-rc
google · Dec 20, 2021 · ad3cb81 · ad3cb81
2 parents 665ce48 + 480e002
commit ad3cb81
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 20 deletions.
diff --git a/appcompat-theme/build.gradle b/appcompat-theme/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/drawablepainter/build.gradle b/drawablepainter/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/flowlayout/build.gradle b/flowlayout/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 GROUP=com.google.accompanist
 # !! No longer need to update this manually when using a Compose SNAPSHOT
-VERSION_NAME=0.21.5-rc
+VERSION_NAME=0.22.0-rc
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,14 @@
 [versions]
 compose = "1.1.0-rc01"
 composesnapshot = "-" # a single character = no snapshot
+composeCompiler = "1.1.0-rc02"
 
 # gradlePlugin and lint need to be updated together
 gradlePlugin = "7.0.4"
 lint = "30.0.3"
 
 ktlint = "0.42.1"
-kotlin = "1.6.0"
+kotlin = "1.6.10"
 coroutines = "1.5.2"
 okhttp = "3.12.13"
 coil = "1.3.2"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

diff --git a/insets-ui/build.gradle b/insets-ui/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/insets/build.gradle b/insets/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/internal-testutils/build.gradle b/internal-testutils/build.gradle
@@ -38,7 +38,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/navigation-animation/build.gradle b/navigation-animation/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/navigation-material/build.gradle b/navigation-material/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/pager-indicators/build.gradle b/pager-indicators/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/pager/build.gradle b/pager/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/permissions/build.gradle b/permissions/build.gradle
@@ -51,7 +51,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/placeholder-material/build.gradle b/placeholder-material/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/placeholder/build.gradle b/placeholder/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -42,7 +42,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 }
 

diff --git a/swiperefresh/build.gradle b/swiperefresh/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {

diff --git a/systemuicontroller/build.gradle b/systemuicontroller/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.get()
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
 
     lintOptions {