From 649a850ae9aed615757102a7bee0e370e640e850 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Thu, 6 Oct 2022 12:46:24 +0800
Subject: [PATCH] Upgrade Kotlin version to 1.7.20 for SpaLib

Bug: 235727273
Test: Unit test & Manual with Gallery App
Change-Id: Icc65e45811fda5442027ce8be210132371e51b4c
---
 packages/SettingsLib/Spa/build.gradle                         | 3 ++-
 packages/SettingsLib/Spa/gallery/build.gradle                 | 2 +-
 .../SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties  | 2 +-
 packages/SettingsLib/Spa/spa/Android.bp                       | 2 +-
 packages/SettingsLib/Spa/spa/build.gradle                     | 4 ++--
 packages/SettingsLib/Spa/tests/build.gradle                   | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/SettingsLib/Spa/build.gradle b/packages/SettingsLib/Spa/build.gradle
index 6384cad7d620d..811cdd804f8bf 100644
--- a/packages/SettingsLib/Spa/build.gradle
+++ b/packages/SettingsLib/Spa/build.gradle
@@ -18,11 +18,12 @@ buildscript {
     ext {
         spa_min_sdk = 21
         jetpack_compose_version = '1.2.0-alpha04'
+        jetpack_compose_compiler_version = '1.3.2'
         jetpack_compose_material3_version = '1.0.0-alpha06'
     }
 }
 plugins {
     id 'com.android.application' version '7.3.0' apply false
     id 'com.android.library' version '7.3.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
 }
diff --git a/packages/SettingsLib/Spa/gallery/build.gradle b/packages/SettingsLib/Spa/gallery/build.gradle
index 98e67459aa572..551a0b107e3a0 100644
--- a/packages/SettingsLib/Spa/gallery/build.gradle
+++ b/packages/SettingsLib/Spa/gallery/build.gradle
@@ -52,7 +52,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion jetpack_compose_version
+        kotlinCompilerExtensionVersion jetpack_compose_compiler_version
     }
     packagingOptions {
         resources {
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties
index 52095e19cc0c7..bd7e7ff382058 100644
--- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties
@@ -16,7 +16,7 @@
 
 #Thu Jul 14 10:36:06 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/SettingsLib/Spa/spa/Android.bp b/packages/SettingsLib/Spa/spa/Android.bp
index 6871f2154bd6b..1d42e27ed9f21 100644
--- a/packages/SettingsLib/Spa/spa/Android.bp
+++ b/packages/SettingsLib/Spa/spa/Android.bp
@@ -35,7 +35,7 @@ android_library {
     ],
     kotlincflags: [
         "-Xjvm-default=all",
-        "-Xopt-in=kotlin.RequiresOptIn",
+        "-opt-in=kotlin.RequiresOptIn",
     ],
     min_sdk_version: "31",
 }
diff --git a/packages/SettingsLib/Spa/spa/build.gradle b/packages/SettingsLib/Spa/spa/build.gradle
index 418d6cb477fa4..362953f974139 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle
+++ b/packages/SettingsLib/Spa/spa/build.gradle
@@ -43,13 +43,13 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        freeCompilerArgs = ["-Xjvm-default=all", "-Xopt-in=kotlin.RequiresOptIn"]
+        freeCompilerArgs = ["-Xjvm-default=all", "-opt-in=kotlin.RequiresOptIn"]
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion jetpack_compose_version
+        kotlinCompilerExtensionVersion jetpack_compose_compiler_version
     }
     packagingOptions {
         resources {
diff --git a/packages/SettingsLib/Spa/tests/build.gradle b/packages/SettingsLib/Spa/tests/build.gradle
index 21d696f7e90c7..f950e01b9740a 100644
--- a/packages/SettingsLib/Spa/tests/build.gradle
+++ b/packages/SettingsLib/Spa/tests/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion jetpack_compose_version
+        kotlinCompilerExtensionVersion jetpack_compose_compiler_version
     }
     packagingOptions {
         resources {