Upgrade SpaLib AGP to 8.0.0
Also - Kotlin to 1.8.10 - Unify the kotlin jvm target version to 17. - androidx.navigation:navigation-compose to 2.6.0-alpha08 Bug: 260441791 Test: Gradle Sync Test: Build Gallery Change-Id: Iddf49d2b630674d25216cde625cf3e0027f57f05
This commit is contained in:
@@ -14,17 +14,27 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
buildscript {
|
||||
ext {
|
||||
BUILD_TOOLS_VERSION = "30.0.3"
|
||||
MIN_SDK = 21
|
||||
TARGET_SDK = 33
|
||||
jetpack_compose_version = '1.4.0-beta01'
|
||||
jetpack_compose_compiler_version = '1.4.0'
|
||||
jetpack_compose_compiler_version = '1.4.4'
|
||||
}
|
||||
}
|
||||
plugins {
|
||||
id 'com.android.application' version '8.0.0-beta05' apply false
|
||||
id 'com.android.library' version '8.0.0-beta05' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
|
||||
id 'com.android.application' version '8.0.0' apply false
|
||||
id 'com.android.library' version '8.0.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
|
||||
}
|
||||
subprojects {
|
||||
tasks.withType(KotlinCompile).configureEach {
|
||||
kotlinOptions {
|
||||
jvmTarget = "17"
|
||||
freeCompilerArgs = ["-Xjvm-default=all"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,12 +42,8 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = '11'
|
||||
freeCompilerArgs = ["-Xjvm-default=all"]
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
buildFeatures {
|
||||
compose true
|
||||
|
||||
@@ -51,10 +51,6 @@ android {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = '17'
|
||||
freeCompilerArgs = ["-Xjvm-default=all"]
|
||||
}
|
||||
buildFeatures {
|
||||
compose true
|
||||
}
|
||||
@@ -79,7 +75,7 @@ dependencies {
|
||||
api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"
|
||||
api "androidx.lifecycle:lifecycle-livedata-ktx"
|
||||
api "androidx.lifecycle:lifecycle-runtime-compose"
|
||||
api "androidx.navigation:navigation-compose:2.6.0-alpha07"
|
||||
api "androidx.navigation:navigation-compose:2.6.0-alpha08"
|
||||
api "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha"
|
||||
api "com.google.android.material:material:1.7.0-alpha03"
|
||||
debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"
|
||||
|
||||
@@ -41,10 +41,6 @@ android {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = '17'
|
||||
freeCompilerArgs = ["-Xjvm-default=all"]
|
||||
}
|
||||
buildFeatures {
|
||||
compose true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user