From aae615ff33df8013de707b73fe871dc7d13fc56c Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Sun, 29 Jan 2023 00:28:29 +0800
Subject: [PATCH] Upgrade kotlin to 1.8

Also upgrade Jetpack Compose to 1.4.0-alpha05

Bug: 260441791
Test: Gradle Sync
Test: Run Gallery
Change-Id: Ib871ecfffaccf4e6a988a73da0ecf01e5be8e650
---
 packages/SettingsLib/Spa/build.gradle     | 6 +++---
 packages/SettingsLib/Spa/spa/build.gradle | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/SettingsLib/Spa/build.gradle b/packages/SettingsLib/Spa/build.gradle
index ded62516bb684..9117524a3e88b 100644
--- a/packages/SettingsLib/Spa/build.gradle
+++ b/packages/SettingsLib/Spa/build.gradle
@@ -19,12 +19,12 @@ buildscript {
         BUILD_TOOLS_VERSION = "30.0.3"
         MIN_SDK = 21
         TARGET_SDK = 33
-        jetpack_compose_version = '1.4.0-alpha03'
-        jetpack_compose_compiler_version = '1.3.2'
+        jetpack_compose_version = '1.4.0-alpha05'
+        jetpack_compose_compiler_version = '1.4.0'
     }
 }
 plugins {
     id 'com.android.application' version '7.3.1' apply false
     id 'com.android.library' version '7.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle
index bf4ad758e465f..e035615664026 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle
+++ b/packages/SettingsLib/Spa/spa/build.gradle
@@ -75,9 +75,9 @@ dependencies {
     api "androidx.slice:slice-builders:1.1.0-alpha02"
     api "androidx.slice:slice-core:1.1.0-alpha02"
     api "androidx.slice:slice-view:1.1.0-alpha02"
-    api "androidx.compose.material3:material3:1.1.0-alpha03"
+    api "androidx.compose.material3:material3:1.1.0-alpha05"
     api "androidx.compose.material:material-icons-extended:$jetpack_compose_version"
-    api "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version"
+    api "androidx.compose.runtime:runtime-livedata:1.4.0-alpha04"
     api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"
     api "androidx.lifecycle:lifecycle-livedata-ktx:$jetpack_lifecycle_version"
     api "androidx.lifecycle:lifecycle-runtime-compose:$jetpack_lifecycle_version"