Skip to content

chore: update all dependencies to latest versions (AGP 9.0, Kotlin 2.3.0, CMP 1.10.0) #17

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
dosier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: update all dependencies to latest versions (AGP 9.0, Kotlin 2.3.0, CMP 1.10.0) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build-logic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repositories {

dependencies {
// Use explicit dependency since version catalog may not be fully available in build-logic
implementation("com.vanniktech:gradle-maven-publish-plugin:0.34.0")
implementation("com.vanniktech:gradle-maven-publish-plugin:0.35.0")
}

2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
// in each subproject's classloader
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.composeHotReload) apply false
alias(libs.plugins.androidKotlinMultiplatformLibrary) apply false
alias(libs.plugins.composeMultiplatform) apply false
alias(libs.plugins.composeCompiler) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
Expand Down
5 changes: 5 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ kotlin.mpp.enableCInteropCommonization=true
#Android
android.useAndroidX=true
android.nonTransitiveRClass=true
# AGP 9.0 compatibility flags for sample app (multiplatform application module)
# The library modules use com.android.kotlin.multiplatform.library plugin
# TODO: Split sample app into separate Android app + shared KMP module to remove these flags
android.builtInKotlin=false
android.newDsl=false
29 changes: 14 additions & 15 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
[versions]
agp = "8.10.1"
android-compileSdk = "35"
agp = "9.0.0"
android-compileSdk = "36"
android-minSdk = "24"
android-targetSdk = "35"
androidx-activity = "1.11.0"
androidx-activity = "1.12.2"
androidx-core = "1.17.0"
androidx-lifecycle = "2.9.4"
composeHotReload = "1.0.0-beta09"
composeMultiplatform = "1.9.0"
androidx-lifecycle = "2.10.0-alpha06"
composeMultiplatform = "1.10.0"
filekitCore = "0.12.0"
filekitDialogsCompose = "0.12.0"
junit = "4.13.2"
kotlin = "2.2.20"
kotlin-logging = "7.0.4"
kotlin = "2.3.0"
kotlin-logging = "7.0.14"
kotlinBrowser = "2025.7.5"
kotlinx-coroutines = "1.10.2"
kotlinx-io = "0.8.0"
kotlinx-serialization = "1.7.3"
kotlinx-io = "0.8.2"
kotlinx-serialization = "1.10.0"
kotlinxBenchmarkRuntime = "0.4.14"
ktor3 = "3.3.0"
ktor3 = "3.3.3"
material-icons = "1.7.3"

[libraries]
# Build Logic
vanniktech-mavenPublish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.34.0" }
vanniktech-mavenPublish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.35.0" }

# Runtime Dependencies
filekit-dialogs-compose = { module = "io.github.vinceglb:filekit-dialogs-compose", version.ref = "filekitDialogsCompose" }
Expand All @@ -47,15 +46,15 @@ bignum = { module = "com.ionspin.kotlin:bignum", version = "0.3.10" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor3" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor3" }
material-icons = { module = "org.jetbrains.compose.material:material-icons-core", version.ref="material-icons" }
slf4j-simple = { module = "org.slf4j:slf4j-simple", version = "2.0.16" }
slf4j-simple = { module = "org.slf4j:slf4j-simple", version = "2.0.17" }

[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" }
androidKotlinMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinJsPlainObjects = { id = "org.jetbrains.kotlin.plugin.js-plain-objects", version.ref = "kotlin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
vanniktech-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
vanniktech-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.35.0" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Sat Feb 15 23:26:08 CET 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
37 changes: 22 additions & 15 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 5 additions & 15 deletions kodio-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinJsPlainObjects)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.androidKotlinMultiplatformLibrary)
id("kodio-publish-convention")
}

Expand All @@ -21,8 +21,10 @@ kodioPublishing {
kotlin {
jvm()
jvmToolchain(21)
androidTarget {
publishLibraryVariants("release")
androidLibrary {
namespace = "space.kodio"
compileSdk = 36
minSdk = 24
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
Expand Down Expand Up @@ -84,18 +86,6 @@ kotlin {
}
}

android {
namespace = "space.kodio"
compileSdk = libs.versions.android.compileSdk.get().toInt()
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

val nativeLibsDir = "space/kodio/core/natives"
val nativePermissionsProject = project(":kodio-native:audio-permissions")
val nativeProcessingProject = project(":kodio-native:audio-processing")
Expand Down
21 changes: 5 additions & 16 deletions kodio-extensions/compose-material3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeHotReload)
alias(libs.plugins.androidKotlinMultiplatformLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.composeCompiler)
id("kodio-publish-convention")
Expand All @@ -22,8 +21,10 @@ kodioPublishing {

kotlin {
jvm()
androidTarget {
publishLibraryVariants("release")
androidLibrary {
namespace = "space.kodio.compose.material3"
compileSdk = 36
minSdk = 24
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
Expand Down Expand Up @@ -69,15 +70,3 @@ kotlin {
}
}
}

android {
namespace = "space.kodio"
compileSdk = libs.versions.android.compileSdk.get().toInt()
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
21 changes: 5 additions & 16 deletions kodio-extensions/compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeHotReload)
alias(libs.plugins.androidKotlinMultiplatformLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.composeCompiler)
id("kodio-publish-convention")
Expand All @@ -22,8 +21,10 @@ kodioPublishing {

kotlin {
jvm()
androidTarget {
publishLibraryVariants("release")
androidLibrary {
namespace = "space.kodio.compose"
compileSdk = 36
minSdk = 24
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
Expand Down Expand Up @@ -92,15 +93,3 @@ kotlin {
}
}
}

android {
namespace = "space.kodio"
compileSdk = libs.versions.android.compileSdk.get().toInt()
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
Loading
Loading