Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Upgrade Kotlin version to 1.7.20 for SpaLib"

Browse Source
This commit is contained in:
Chaohui Wang
2022-10-08 02:33:39 +00:00
committed by Android (Google) Code Review
parent 5ef5f5172b 649a850ae9
commit 196affa704
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/Spa/build.gradle
View File

@@ -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
}

2
packages/SettingsLib/Spa/gallery/build.gradle
View File

@@ -52,7 +52,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion jetpack_compose_version
kotlinCompilerExtensionVersion jetpack_compose_compiler_version
}
packagingOptions {
resources {

2
packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

2
packages/SettingsLib/Spa/spa/Android.bp
View File

@@ -35,7 +35,7 @@ android_library {
],
kotlincflags: [
"-Xjvm-default=all",
"-Xopt-in=kotlin.RequiresOptIn",
"-opt-in=kotlin.RequiresOptIn",
],
min_sdk_version: "31",
}

4
packages/SettingsLib/Spa/spa/build.gradle
View File

@@ -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 {

2
packages/SettingsLib/Spa/tests/build.gradle
View File

@@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion jetpack_compose_version
kotlinCompilerExtensionVersion jetpack_compose_compiler_version
}
packagingOptions {
resources {