Skip to content

Update to AGP 9 #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RudolfHladik wants to merge 2 commits into
base: feature/6.x-context-params
Choose a base branch
from
Open

Update to AGP 9 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df9d4b8
chore(build): upgrade AGP to 9.1, Gradle to 9.4, Kotlin to 2.3
RudolfHladik Mar 13, 2026
55fd9cd
Merge branch 'feature/6.x-context-params' into feature/6.x-agp-9
RudolfHladik Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Copy link
Copy Markdown
Member

@matejsemancik matejsemancik Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is dagger needed if we already have Hilt?

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
Expand All @@ -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"
}
7 changes: 4 additions & 3 deletions buildSrc/src/main/kotlin/app/futured/arkitekt/DependencyUpdates.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {

Expand All @@ -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")
}
}
}
Expand Down
1 change: 0 additions & 1 deletion compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion core-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary

plugins {
id("com.android.library")
id("kotlin-android")
id(Deps.Plugins.mavenPublish)
}

Expand Down
1 change: 0 additions & 1 deletion core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion cr-usecases-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary

plugins {
id("com.android.library")
id("kotlin-android")
id(Deps.Plugins.mavenPublish)
}

Expand Down
21 changes: 5 additions & 16 deletions cr-usecases/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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
}
}
25 changes: 5 additions & 20 deletions decompose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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()
Expand Down Expand Up @@ -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
}
}
1 change: 0 additions & 1 deletion example/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading