From b6c46b7240141c9194ee744a2370ead2ef1a289d Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Tue, 19 Aug 2025 15:45:58 +0800 Subject: [PATCH] chore: bump dependencies --- build.gradle.kts | 16 ++++++++++++++++ gradle.properties | 1 - .../sweet-dependency-config.yaml | 4 ++-- hikage-core/build.gradle.kts | 9 --------- .../java/com/highcapable/hikage/core/Hikage.kt | 1 - hikage-extension-betterandroid/build.gradle.kts | 8 -------- hikage-extension-compose/build.gradle.kts | 8 -------- hikage-extension/build.gradle.kts | 8 -------- hikage-widget-androidx/build.gradle.kts | 8 -------- hikage-widget-material/build.gradle.kts | 8 -------- samples/app/build.gradle.kts | 8 -------- settings.gradle.kts | 2 +- 12 files changed, 19 insertions(+), 62 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1809703..8b04dbd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,8 @@ import com.android.build.gradle.LibraryExtension 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 @@ -65,6 +67,20 @@ libraryProjects { } } +allprojects { + tasks.withType().configureEach { + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + freeCompilerArgs.addAll( + "-opt-in=kotlin.ExperimentalStdlibApi", + "-Xno-param-assertions", + "-Xno-call-assertions", + "-Xno-receiver-assertions" + ) + } + } +} + fun libraryProjects(action: Action) { val libraries = listOf( Libraries.HIKAGE_CORE, diff --git a/gradle.properties b/gradle.properties index f655761..3af1439 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=Hikage project.url=https://github.com/BetterAndroid/Hikage diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index 37268aa..c331ca5 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -24,7 +24,7 @@ plugins: auto-update: false com.android.application: alias: android-application - version: 8.9.3 + version: 8.12.1 com.android.library: alias: android-library version-ref: android-application @@ -131,7 +131,7 @@ libraries: version: 3.7.0 com.android.tools.lint: lint: - version: 31.12.0 + version: 31.12.1 lint-api: version-ref: ::lint lint-checks: diff --git a/hikage-core/build.gradle.kts b/hikage-core/build.gradle.kts index 7386bed..f21917a 100644 --- a/hikage-core/build.gradle.kts +++ b/hikage-core/build.gradle.kts @@ -28,15 +28,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = listOf( - "-opt-in=kotlin.ExperimentalStdlibApi", - "-Xno-param-assertions", - "-Xno-call-assertions", - "-Xno-receiver-assertions" - ) - } } dependencies { diff --git a/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt b/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt index bcec0d0..7a054e5 100644 --- a/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt +++ b/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt @@ -53,7 +53,6 @@ import com.highcapable.betterandroid.ui.extension.view.inflate import com.highcapable.betterandroid.ui.extension.view.layoutInflater import com.highcapable.hikage.annotation.Hikageable import com.highcapable.hikage.bypass.XmlBlockBypass -import com.highcapable.hikage.core.Hikage.LayoutParamsBody import com.highcapable.hikage.core.base.HikageFactory import com.highcapable.hikage.core.base.HikageFactoryBuilder import com.highcapable.hikage.core.base.HikagePerformer diff --git a/hikage-extension-betterandroid/build.gradle.kts b/hikage-extension-betterandroid/build.gradle.kts index 0689dab..364b25d 100644 --- a/hikage-extension-betterandroid/build.gradle.kts +++ b/hikage-extension-betterandroid/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/hikage-extension-compose/build.gradle.kts b/hikage-extension-compose/build.gradle.kts index 07b283e..a5f082a 100644 --- a/hikage-extension-compose/build.gradle.kts +++ b/hikage-extension-compose/build.gradle.kts @@ -28,14 +28,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/hikage-extension/build.gradle.kts b/hikage-extension/build.gradle.kts index b8a10b0..4862667 100644 --- a/hikage-extension/build.gradle.kts +++ b/hikage-extension/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/hikage-widget-androidx/build.gradle.kts b/hikage-widget-androidx/build.gradle.kts index 7a9e08f..5999043 100644 --- a/hikage-widget-androidx/build.gradle.kts +++ b/hikage-widget-androidx/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/hikage-widget-material/build.gradle.kts b/hikage-widget-material/build.gradle.kts index cf4ea8a..c8dc377 100644 --- a/hikage-widget-material/build.gradle.kts +++ b/hikage-widget-material/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/samples/app/build.gradle.kts b/samples/app/build.gradle.kts index 8434233..1248e83 100644 --- a/samples/app/build.gradle.kts +++ b/samples/app/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" - ) - } buildFeatures { buildConfig = true viewBinding = true diff --git a/settings.gradle.kts b/settings.gradle.kts index c5670d2..74ba0cc 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 } }