diff --git a/build.gradle.kts b/build.gradle.kts index a895ba5..3348b86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,21 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile + plugins { autowire(libs.plugins.android.application) apply false autowire(libs.plugins.kotlin.android) apply false autowire(libs.plugins.kotlin.ksp) apply false +} + +allprojects { + tasks.withType().configureEach { + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + freeCompilerArgs.addAll( + "-Xno-param-assertions", + "-Xno-call-assertions", + "-Xno-receiver-assertions" + ) + } + } } \ No newline at end of file diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 2194a81..c7fcac7 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -43,14 +43,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 fcd1be4..21a52d2 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=AppErrorsTracking project.android.compileSdk=35 diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index d358f7e..ff82e2e 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -22,16 +22,16 @@ repositories: plugins: com.android.application: alias: android-application - version: 8.9.3 + version: 8.12.1 org.jetbrains.kotlin.android: alias: kotlin-android - version: 2.1.10 + version: 2.2.10 com.highcapable.flexilocale: alias: flexi-locale - version: 1.0.1 + version: 1.0.2 com.google.devtools.ksp: alias: kotlin-ksp - version: 2.1.10-1.0.31 + version: 2.2.10-2.0.2 libraries: com.fankes.projectpromote: @@ -68,13 +68,13 @@ libraries: version: 1.0.7 com.google.code.gson: gson: - version: 2.12.1 + version: 2.13.1 com.squareup.okhttp3: okhttp: - version: 5.0.0-alpha.16 + version: 5.1.0 androidx.core: core-ktx: - version: 1.16.0 + version: 1.17.0 androidx.appcompat: appcompat: version: 1.7.1 @@ -86,10 +86,10 @@ libraries: version: 2.2.1 androidx.test.ext: junit: - version: 1.2.1 + version: 1.3.0 androidx.test.espresso: espresso-core: - version: 3.6.1 + version: 3.7.0 junit: junit: version: 4.13.2 \ No newline at end of file diff --git a/module-app/build.gradle.kts b/module-app/build.gradle.kts index 7f8af90..2442f3e 100644 --- a/module-app/build.gradle.kts +++ b/module-app/build.gradle.kts @@ -39,14 +39,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 63bb25b..780f504 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,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 { global {