Update Kotlin to 2.0.0 (#276)
This commit is contained in:
@@ -9,6 +9,7 @@ class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
|
||||
override fun apply(target: Project) {
|
||||
with(target) {
|
||||
pluginManager.apply("com.android.application")
|
||||
pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
|
||||
|
||||
extensions.configure<BaseAppModuleExtension> {
|
||||
configureAndroidCompose(this)
|
||||
|
||||
@@ -8,6 +8,8 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
|
||||
|
||||
override fun apply(target: Project) {
|
||||
with(target) {
|
||||
pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
|
||||
|
||||
extensions.configure<LibraryExtension> {
|
||||
configureAndroidCompose(this)
|
||||
}
|
||||
|
||||
@@ -20,11 +20,6 @@ internal fun Project.configureAndroidCompose(
|
||||
compose = true
|
||||
}
|
||||
|
||||
composeOptions {
|
||||
val version = libs.findVersion("composeKotlinCompilerExtension")
|
||||
kotlinCompilerExtensionVersion = version.get().toString()
|
||||
}
|
||||
|
||||
// Add compose-destinations generated code to Gradle source sets
|
||||
variants.all {
|
||||
kotlin.sourceSets {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package gq.kirmanak.mealient
|
||||
|
||||
import com.android.build.api.dsl.CommonExtension
|
||||
import org.gradle.api.Action
|
||||
import org.gradle.api.NamedDomainObjectContainer
|
||||
import org.gradle.api.Project
|
||||
@@ -8,7 +7,6 @@ import org.gradle.api.artifacts.MinimalExternalModuleDependency
|
||||
import org.gradle.api.plugins.ExtensionAware
|
||||
import org.gradle.api.provider.Provider
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
|
||||
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
|
||||
|
||||
internal val Project.kotlin: KotlinAndroidProjectExtension
|
||||
@@ -24,6 +22,3 @@ internal fun Project.library(name: String): Provider<MinimalExternalModuleDepend
|
||||
return libs.findLibrary(name).get()
|
||||
}
|
||||
|
||||
internal fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
|
||||
(this as ExtensionAware).extensions.configure("kotlinOptions", block)
|
||||
}
|
||||
|
||||
@@ -20,10 +20,6 @@ internal fun Project.configureKotlinAndroid(
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
freeCompilerArgs = freeCompilerArgs + listOf("-opt-in=kotlin.RequiresOptIn")
|
||||
}
|
||||
|
||||
lint {
|
||||
disable += listOf(
|
||||
"ObsoleteLintCustomCheck",
|
||||
|
||||
Reference in New Issue
Block a user