commit ef4a221f9e85ca4eb78d7a4e5f42587904c158d4
author Chaohui Wang <chaohuiw@google.com> Wed Aug 16 10:15:18 2023 +0800
committer Chaohui Wang <chaohuiw@google.com> Wed Aug 16 10:15:18 2023 +0800
tree e1bbb83f5acae2f1ea2bda6d02bf9ec82019659e
parent cc1ca999604292e2710742d139b9582305e8f876

[Spa] Upgrade Kotlin to 1.9.0

Also upgrade other libraries.

Bug: 289155281
Test: Gradle Sync
Test: Run gallery
Test: unit test
Change-Id: I9be3d6162c3aa3fd28c4c03a18816814049519e1

packages/SettingsLib/Spa/build.gradle.kts

diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts
index e76139f..1cc2867 100644
--- a/packages/SettingsLib/Spa/build.gradle.kts
+++ b/packages/SettingsLib/Spa/build.gradle.kts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import com.android.build.api.dsl.CommonExtension
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.api.AndroidBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -25,7 +26,7 @@
 }
 
 allprojects {
-    extra["jetpackComposeVersion"] = "1.6.0-alpha01"
+    extra["jetpackComposeVersion"] = "1.6.0-alpha02"
 }
 
 subprojects {
@@ -47,10 +48,10 @@
 
     afterEvaluate {
         plugins.withType<AndroidBasePlugin> {
-            configure<BaseExtension> {
+            the(CommonExtension::class).apply {
                 if (buildFeatures.compose == true) {
                     composeOptions {
-                        kotlinCompilerExtensionVersion = "1.4.4"
+                        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
                     }
                 }
             }