Update AGP

This commit is contained in:
topjohnwu
2023-02-20 01:03:35 -08:00
parent 4ba365565f
commit 9b1e173373
4 changed files with 17 additions and 13 deletions

View File

@ -11,11 +11,11 @@ import org.gradle.api.Action
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.ExtensionAware
import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.Delete
import org.gradle.api.tasks.StopExecutionException
import org.gradle.api.tasks.Sync
import org.gradle.kotlin.dsl.*
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
@ -38,6 +38,11 @@ private fun BaseExtension.kotlinOptions(configure: Action<KotlinJvmOptions>) =
configure.execute(it as KotlinJvmOptions)
}
private fun BaseExtension.kotlin(configure: Action<KotlinAndroidProjectExtension>) =
(this as ExtensionAware).extensions.findByName("kotlin")?.let {
configure.execute(it as KotlinAndroidProjectExtension)
}
private val Project.android: BaseAppModuleExtension
get() = extensions["android"] as BaseAppModuleExtension
@ -60,6 +65,10 @@ fun Project.setupCommon() {
kotlinOptions {
jvmTarget = "17"
}
kotlin {
jvmToolchain(17)
}
}
}
@ -130,6 +139,10 @@ private fun Project.setupAppCommon() {
dependenciesInfo {
includeInApk = false
}
buildFeatures {
buildConfig = true
}
}
android.applicationVariants.all {