Merge pull request #1002 from google/ben/release1.1

bentrengrove · web-flow · commit 76e107e27496 · 2022-02-10T06:14:59.000+11:00
Update to Compose 1.1
diff --git a/appcompat-theme/build.gradle b/appcompat-theme/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/drawablepainter/build.gradle b/drawablepainter/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/flowlayout/build.gradle b/flowlayout/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.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.22.1-rc
+VERSION_NAME=0.23.0
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
-compose = "1.1.0-rc03"
+compose = "1.1.0"
 composesnapshot = "-" # a single character = no snapshot
-composeCompiler = "1.1.0-rc03"
 
 # gradlePlugin and lint need to be updated together
 gradlePlugin = "7.0.4"
diff --git a/insets-ui/build.gradle b/insets-ui/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/insets/build.gradle b/insets/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/internal-testutils/build.gradle b/internal-testutils/build.gradle
@@ -38,7 +38,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/navigation-animation/build.gradle b/navigation-animation/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/navigation-material/build.gradle b/navigation-material/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/pager-indicators/build.gradle b/pager-indicators/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/pager/build.gradle b/pager/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/permissions/build.gradle b/permissions/build.gradle
@@ -51,7 +51,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/placeholder-material/build.gradle b/placeholder-material/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/placeholder/build.gradle b/placeholder/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -42,7 +42,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 }
 
diff --git a/swiperefresh/build.gradle b/swiperefresh/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {
diff --git a/systemuicontroller/build.gradle b/systemuicontroller/build.gradle
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+        kotlinCompilerExtensionVersion libs.versions.compose.get()
     }
 
     lintOptions {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`composeOptions {`
`48`		`- kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()`
	`48`	`+ kotlinCompilerExtensionVersion libs.versions.compose.get()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`lintOptions {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ android {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`composeOptions {`
`41`		`- kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()`
	`41`	`+ kotlinCompilerExtensionVersion libs.versions.compose.get()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`lintOptions {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ android {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`composeOptions {`
`49`		`- kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()`
	`49`	`+ kotlinCompilerExtensionVersion libs.versions.compose.get()`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`lintOptions {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`composeOptions {`
`54`		`- kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()`
	`54`	`+ kotlinCompilerExtensionVersion libs.versions.compose.get()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`lintOptions {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ android {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`composeOptions {`
`45`		`- kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()`
	`45`	`+ kotlinCompilerExtensionVersion libs.versions.compose.get()`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`