diff --git a/build.gradle.kts b/build.gradle.kts index 46f3b6e..4ba26fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,8 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.jetbrains.dokka.gradle.DokkaTask +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { autowire(libs.plugins.android.application) apply false @@ -50,6 +52,19 @@ libraryProjects { } } +allprojects { + tasks.withType().configureEach { + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + freeCompilerArgs.addAll( + "-Xno-param-assertions", + "-Xno-call-assertions", + "-Xno-receiver-assertions" + ) + } + } +} + fun libraryProjects(action: Action) { val libraries = listOf( Libraries.PANGUTEXT_ANDROID, diff --git a/demo-android/build.gradle.kts b/demo-android/build.gradle.kts index 2c1e933..d42d8fb 100644 --- a/demo-android/build.gradle.kts +++ b/demo-android/build.gradle.kts @@ -25,14 +25,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = listOf( - "-Xno-param-assertions", - "-Xno-call-assertions", - "-Xno-receiver-assertions" - ) - } buildFeatures { buildConfig = true viewBinding = true diff --git a/gradle.properties b/gradle.properties index cdb5a2c..640ef8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.nonTransitiveRClass=true kotlin.code.style=official -kotlin.incremental.useClasspathSnapshot=true # Project Configuration project.name=PanguText project.url=https://github.com/BetterAndroid/PanguText diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index d9157cc..0f305d0 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -13,13 +13,13 @@ repositories: plugins: com.android.application: alias: android-application - version: 8.9.3 + version: 8.12.1 com.android.library: alias: android-library version-ref: com.android.application org.jetbrains.kotlin.android: alias: kotlin-android - version: 2.1.10 + version: 2.2.10 org.jetbrains.dokka: alias: kotlin-dokka version: 1.9.20 diff --git a/pangutext-android/build.gradle.kts b/pangutext-android/build.gradle.kts index 261b80d..7ebdda5 100644 --- a/pangutext-android/build.gradle.kts +++ b/pangutext-android/build.gradle.kts @@ -27,14 +27,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = listOf( - "-Xno-param-assertions", - "-Xno-call-assertions", - "-Xno-receiver-assertions" - ) - } } dependencies { diff --git a/settings.gradle.kts b/settings.gradle.kts index ce74d01..3bc7fe4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { } plugins { id("com.highcapable.sweetdependency") version "1.0.4" - id("com.highcapable.sweetproperty") version "1.0.5" + id("com.highcapable.sweetproperty") version "1.0.8" } sweetProperty { rootProject { all { isEnable = false } }