diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b844dc13..d9ad990a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ object Versions { // android gradle plugin - const val gradlePlugin = "8.13.0" + const val gradlePlugin = "9.1.0" // plugins const val detekt = "1.23.8" @@ -10,28 +10,26 @@ object Versions { const val dokka = "1.6.10" // kotlin - const val kotlin = "2.2.10" - const val ksp = "2.2.10-2.0.2" + const val kotlin = "2.3.10" + const val ksp = "2.3.5" const val coroutines = "1.10.2" // core const val appcompat = "1.6.1" - const val multidex = "2.0.1" - const val material = "1.10.0" const val test = "2.2.0" - const val lifeCycle = "2.8.7" - const val hilt = "2.58" + const val dagger = "2.59.2" + const val hilt = "2.59.2" const val hiltJetpack = "1.3.0" const val androidXEspresso = "3.5.1" const val navigation3 = "1.0.0" const val lifecycleViewmodelNav3 = "2.10.0" - const val composeBom = "2025.11.01" + const val composeBom = "2026.02.01" const val activityCompose = "1.10.1" // android tools @@ -50,10 +48,11 @@ object Versions { const val robolectric = "4.16.1" // decompose - const val decompose = "3.3.0" + const val decompose = "3.4.0" const val essenty = "2.5.0" - + const val koin = "4.2.0-beta2" + const val kermit = "2.0.4" const val jetbrainsComposeRuntime = "1.11.0-alpha01" const val poet = "2.2.0" - const val serialization = "1.9.0" + const val serialization = "1.10.0" } diff --git a/buildSrc/src/main/kotlin/app/futured/arkitekt/DependencyUpdates.kt b/buildSrc/src/main/kotlin/app/futured/arkitekt/DependencyUpdates.kt index 17b59b45..5ee8de98 100644 --- a/buildSrc/src/main/kotlin/app/futured/arkitekt/DependencyUpdates.kt +++ b/buildSrc/src/main/kotlin/app/futured/arkitekt/DependencyUpdates.kt @@ -1,6 +1,7 @@ package app.futured.arkitekt import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask +import org.gradle.api.artifacts.ComponentSelection abstract class DependencyUpdates : DependencyUpdatesTask() { @@ -9,12 +10,12 @@ abstract class DependencyUpdates : DependencyUpdatesTask() { this.resolutionStrategy { componentSelection { - all { + all { selection: ComponentSelection -> val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "testing") .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-]*") } - .any { it.matches(candidate.version) } + .any { it.matches(selection.candidate.version) } if (rejected) { - reject("Release candidate") + selection.reject("Release candidate") } } } diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 70b2b95d..a77fef57 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary plugins { id("com.android.library") - id("kotlin-android") id("org.jetbrains.kotlin.plugin.compose") id(Deps.Plugins.mavenPublish) } diff --git a/core-test/build.gradle.kts b/core-test/build.gradle.kts index 0fd38fba..c9b0ad11 100644 --- a/core-test/build.gradle.kts +++ b/core-test/build.gradle.kts @@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary plugins { id("com.android.library") - id("kotlin-android") id(Deps.Plugins.mavenPublish) } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 486758f1..032e475e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary plugins { id("com.android.library") - id("kotlin-android") id("org.jetbrains.kotlin.plugin.compose") id(Deps.Plugins.mavenPublish) } diff --git a/cr-usecases-test/build.gradle.kts b/cr-usecases-test/build.gradle.kts index 4aa7987c..1706e20c 100644 --- a/cr-usecases-test/build.gradle.kts +++ b/cr-usecases-test/build.gradle.kts @@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary plugins { id("com.android.library") - id("kotlin-android") id(Deps.Plugins.mavenPublish) } diff --git a/cr-usecases/build.gradle.kts b/cr-usecases/build.gradle.kts index 5b021957..c85aafc8 100644 --- a/cr-usecases/build.gradle.kts +++ b/cr-usecases/build.gradle.kts @@ -2,7 +2,7 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinMultiplatform plugins { - id("com.android.library") + id("com.android.kotlin.multiplatform.library") id("org.jetbrains.kotlin.multiplatform") id(Deps.Plugins.mavenPublish) } @@ -14,10 +14,10 @@ kotlin { iosX64() iosArm64() iosSimulatorArm64() - androidTarget { - compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) - } + android { + namespace = "app.futured.arkitekt.crusecases" + compileSdk = ProjectSettings.compileSdk + minSdk = ProjectSettings.minSdk } compilerOptions { @@ -77,14 +77,3 @@ mavenPublishing { } } -android { - namespace = "app.futured.arkitekt.crusecases" - compileSdk = ProjectSettings.compileSdk - defaultConfig { - minSdk = ProjectSettings.minSdk - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } -} diff --git a/decompose/build.gradle.kts b/decompose/build.gradle.kts index 024a22a3..4df83cf9 100644 --- a/decompose/build.gradle.kts +++ b/decompose/build.gradle.kts @@ -2,7 +2,7 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinMultiplatform plugins { - id("com.android.library") + id("com.android.kotlin.multiplatform.library") id("org.jetbrains.kotlin.multiplatform") id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlin.plugin.serialization") @@ -12,10 +12,10 @@ plugins { kotlin { jvmToolchain(17) - androidTarget { - compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) - } + android { + namespace = "app.futured.arkitekt.decompose.android" + compileSdk = ProjectSettings.compileSdk + minSdk = ProjectSettings.minSdk } iosX64() @@ -86,18 +86,3 @@ mavenPublishing { } } -android { - namespace = "app.futured.arkitekt.decompose.android" - compileSdk = ProjectSettings.compileSdk - defaultConfig { - minSdk = ProjectSettings.minSdk - } - buildFeatures { - compose = true - buildConfig = true - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } -} diff --git a/example/build.gradle.kts b/example/build.gradle.kts index 74dcc060..7480bb0f 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("com.android.application") - id("kotlin-android") id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlin.plugin.serialization") id("com.google.dagger.hilt.android") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7ad1e65..8cf3635e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-all.zip