From a00d501557654ecd9dcf5be1cfc0305520ccb31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20G=C3=B3mez?= Date: Wed, 18 Mar 2026 17:40:55 +0100 Subject: [PATCH] dependencies updated --- bom/build.gradle.kts | 2 +- build-logic/gradle/libraries.versions.toml | 143 ++++++++++++--------- build.gradle.kts | 3 +- gradle/libraries.versions.toml | 143 ++++++++++++--------- libraries/android-compose/build.gradle.kts | 2 +- libraries/core/build.gradle.kts | 2 +- libraries/coroutines-test/build.gradle.kts | 2 +- libraries/pagination/build.gradle.kts | 2 +- libraries/preferences/build.gradle.kts | 2 +- libraries/threeten-test/build.gradle.kts | 2 +- 10 files changed, 168 insertions(+), 135 deletions(-) diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 3ecb5c9b..58066b71 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -4,7 +4,7 @@ import com.raxdenstudios.publishing.model.Developer plugins { `java-platform` alias(libs.plugins.android.versioning) - alias(libs.plugins.publish.platform) + alias(libs.plugins.android.publish.platform) } versioning { diff --git a/build-logic/gradle/libraries.versions.toml b/build-logic/gradle/libraries.versions.toml index 5e0e47aa..59f4e97f 100644 --- a/build-logic/gradle/libraries.versions.toml +++ b/build-logic/gradle/libraries.versions.toml @@ -21,8 +21,8 @@ ksp = "2.3.6" # ------------------------------------------------------------------- # AndroidX # ------------------------------------------------------------------- -androidx-core-ktx = "1.17.0" -androidx-activity-ktx = "1.12.4" +androidx-core-ktx = "1.18.0" +androidx-activity-ktx = "1.13.0" androidx-fragment-ktx = "1.8.9" androidx-preference-ktx = "1.2.1" androidx-constraintlayout = "2.2.1" @@ -35,24 +35,23 @@ androidx-startup = "1.2.0" androidx-workmanager = "2.11.1" androidx-workmanager-hilt = "1.3.0" -androidx-test-core = "2.2.0" +androidx-arch-core-testing = "2.2.0" androidx-test-junit-ktx = "1.3.0" androidx-test-rules = "1.7.0" androidx-test-runner = "1.7.0" -androidx-media = "1.7.1" -androidx-media3-exoplayer = "1.9.2" +androidx-media3 = "1.7.1" +androidx-media3-exoplayer = "1.9.3" # ------------------------------------------------------------------- # Compose # ------------------------------------------------------------------- -androidx-compose = "1.10.4" -androidx-compose-activity = "1.12.4" -androidx-compose-bom = "2026.02.01" +androidx-compose-bom = "2026.03.00" +androidx-compose-activity = "1.13.0" androidx-compose-navigation = "2.9.7" androidx-compose-navigation-hilt = "1.3.0" androidx-compose-ui-constraintlayout = "1.1.1" -androidx-compose-lifecycle = "2.6.0" +androidx-compose-lifecycle = "2.10.0" # ------------------------------------------------------------------- # Google / Material / Firebase @@ -61,7 +60,8 @@ android-material = "1.13.0" firebase = "34.10.0" firebase-appdistribution = "5.2.1" firebase-crashlytics = "3.0.6" -play-services = "4.4.4" +google-services-plugin = "4.4.4" +play-services-location = "21.3.0" gradle-secrets = "2.0.1" # ------------------------------------------------------------------- @@ -74,7 +74,6 @@ kotlinx-serialization-json = "1.10.0" # Networking / JSON / Utils # ------------------------------------------------------------------- okhttp3 = "5.3.2" -okhttp-mockwebserver = "2.7.5" retrofit2 = "3.0.0" network-response-adapter = "5.0.0" gson = "2.13.2" @@ -88,6 +87,7 @@ gradle-play-publisher = "4.0.0" # DI / DB # ------------------------------------------------------------------- hilt = "2.59.2" +koin = "4.1.1" room = "2.8.4" # ------------------------------------------------------------------- @@ -112,36 +112,23 @@ nmcp = "1.4.4" # ------------------------------------------------------------------- # Testing # ------------------------------------------------------------------- -junit = "4.13.2" -junitVersion = "1.2.1" truth = "1.4.5" turbine = "1.2.1" mockk = "1.14.9" espresso = "3.7.0" -roboletric = "4.16.1" +robolectric = "4.16.1" rest-mock = "0.4.4" timber-test = "1.0.1" # ------------------------------------------------------------------- # Your artifacts # ------------------------------------------------------------------- -android-versioning = "0.57.22" -android-publish-library = "0.57.22" -publish-platform = "0.57.22" - -commons-android = "5.0.26" -commons-android-binding = "1.0.10" -commons-android-compose = "1.0.4" -commons-android-test = "5.0.6" -commons-core = "5.2.11" -commons-coroutines = "5.5.6" -commons-coroutines-test = "5.0.7" -commons-network = "1.0.9" -commons-pagination-co = "5.0.6" -commons-permissions = "5.0.10" -commons-preferences = "5.0.8" -commons-threeten = "5.0.7" -commons-threeten-test = "5.0.10" +android-versioning = "0.57.30" +android-publish-library = "0.57.30" +android-publish-platform = "0.57.30" + +commons-bom = "1.0.3" +commons-preferences = "5.0.10" [libraries] @@ -171,7 +158,7 @@ androidx-work-test = { module = "androidx.work:work-testing", version.ref = "and # ------------------------------------------------------------------- # AndroidX - Media3 # ------------------------------------------------------------------- -androidx-media = { module = "androidx.media:media", version.ref = "androidx-media" } +androidx-media = { module = "androidx.media:media", version.ref = "androidx-media3" } androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "androidx-media3-exoplayer" } androidx-media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "androidx-media3-exoplayer" } androidx-media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "androidx-media3-exoplayer" } @@ -183,8 +170,7 @@ androidx-media3-session = { module = "androidx.media3:media3-session", version.r # ------------------------------------------------------------------- androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-compose-activity" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } -androidx-compose-material = { module = "androidx.compose.material:material" } +androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-compose-navigation" } androidx-compose-navigation-hilt = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-compose-navigation-hilt" } @@ -192,10 +178,10 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-constraintlayout = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-compose-ui-constraintlayout" } androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" } -androidx-compose-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } -androidx-compose-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-compose-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-compose-lifecycle" } +androidx-compose-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-compose-lifecycle" } # ------------------------------------------------------------------- # Material @@ -221,9 +207,14 @@ landscapist-placeholder = { module = "com.github.skydoves:landscapist-placeholde # Firebase (use BOM) # ------------------------------------------------------------------- firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase" } -firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" } -firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" } -firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx" } +firebase-analytics = { module = "com.google.firebase:firebase-analytics" } +firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" } +firebase-messaging = { module = "com.google.firebase:firebase-messaging" } + +# ------------------------------------------------------------------- +# Play services +# ------------------------------------------------------------------- +play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "play-services-location" } # ------------------------------------------------------------------- # Hilt @@ -232,6 +223,17 @@ hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } hilt-test = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } +# ------------------------------------------------------------------- +# Koin +# ------------------------------------------------------------------- +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } +koin-workmanager = { module = "io.insert-koin:koin-androidx-workmanager", version.ref = "koin" } +koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" } +koin-navigation = { module = "io.insert-koin:koin-androidx-navigation", version.ref = "koin" } +koin-startup = { module = "io.insert-koin:koin-androidx-startup", version.ref = "koin" } +koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" } +koin-compose-viewmodel-navigation = { module = "io.insert-koin:koin-compose-viewmodel-navigation", version.ref = "koin" } + # ------------------------------------------------------------------- # KotlinX # ------------------------------------------------------------------- @@ -244,7 +246,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa # ------------------------------------------------------------------- okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" } okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3" } -okhttp-mockwebserver = { module = "com.squareup.okhttp:mockwebserver", version.ref = "okhttp-mockwebserver" } +okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp3" } retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" } retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit2" } @@ -257,9 +259,9 @@ network-response-adapter = { module = "com.github.haroldadmin:NetworkResponseAda # ------------------------------------------------------------------- # Room (KSP compiler in usage: ksp(libs.room-compiler)) # ------------------------------------------------------------------- +room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } -room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } room-test = { module = "androidx.room:room-testing", version.ref = "room" } # ------------------------------------------------------------------- @@ -270,7 +272,7 @@ leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.re # ------------------------------------------------------------------- # Testing # ------------------------------------------------------------------- -androidx-test-core = { module = "androidx.arch.core:core-testing", version.ref = "androidx-test-core" } +androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-arch-core-testing" } androidx-test-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-junit-ktx" } androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-rules" } androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" } @@ -279,7 +281,7 @@ espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" } espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso" } -robolectric = { module = "org.robolectric:robolectric", version.ref = "roboletric" } +robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" } truth = { module = "com.google.truth:truth", version.ref = "truth" } @@ -292,23 +294,26 @@ restmock = { module = "com.github.andrzejchm.RESTMock:android", version.ref = "r # ------------------------------------------------------------------- timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } threetenabp = { module = "com.jakewharton.threetenabp:threetenabp", version.ref = "threetenabp" } +gander-debug = { module = "com.ashokvarma.android:gander-imdb", version.ref = "gander" } +gander-release = { module = "com.ashokvarma.android:gander-no-op", version.ref = "gander" } # ------------------------------------------------------------------- # Your published libs # ------------------------------------------------------------------- -commons-android = { module = "com.raxdenstudios:commons-android", version.ref = "commons-android" } -commons-android-binding = { module = "com.raxdenstudios:commons-android-binding", version.ref = "commons-android-binding" } -commons-android-compose = { module = "com.raxdenstudios:commons-android-compose", version.ref = "commons-android-compose" } -commons-android-test = { module = "com.raxdenstudios:commons-android-test", version.ref = "commons-android-test" } -commons-core = { module = "com.raxdenstudios:commons-core", version.ref = "commons-core" } -commons-coroutines = { module = "com.raxdenstudios:commons-coroutines", version.ref = "commons-coroutines" } -commons-coroutines-test = { module = "com.raxdenstudios:commons-coroutines-test", version.ref = "commons-coroutines-test" } -commons-network = { module = "com.raxdenstudios:commons-network", version.ref = "commons-network" } -commons-pagination-co = { module = "com.raxdenstudios:commons-pagination-co", version.ref = "commons-pagination-co" } -commons-permissions = { module = "com.raxdenstudios:commons-permissions", version.ref = "commons-permissions" } +commons-bom = { module = "com.raxdenstudios:commons-bom", version.ref = "commons-bom" } +commons-android = { module = "com.raxdenstudios:commons-android" } +commons-android-binding = { module = "com.raxdenstudios:commons-android-binding" } +commons-android-compose = { module = "com.raxdenstudios:commons-android-compose" } +commons-android-test = { module = "com.raxdenstudios:commons-android-test" } +commons-core = { module = "com.raxdenstudios:commons-core" } +commons-coroutines = { module = "com.raxdenstudios:commons-coroutines" } +commons-coroutines-test = { module = "com.raxdenstudios:commons-coroutines-test" } +commons-network = { module = "com.raxdenstudios:commons-network" } +commons-pagination-co = { module = "com.raxdenstudios:commons-pagination-co" } +commons-permissions = { module = "com.raxdenstudios:commons-permissions" } commons-preferences = { module = "com.raxdenstudios:commons-preferences", version.ref = "commons-preferences" } -commons-threetenabp = { module = "com.raxdenstudios:commons-threeten", version.ref = "commons-threeten" } -commons-threetenabp-test = { module = "com.raxdenstudios:commons-threeten-test", version.ref = "commons-threeten-test" } +commons-threetenabp = { module = "com.raxdenstudios:commons-threeten" } +commons-threetenabp-test = { module = "com.raxdenstudios:commons-threeten-test" } # ------------------------------------------------------------------- # Build-logic / plugin classpath dependencies (included build) @@ -337,11 +342,15 @@ android-library = { id = "com.android.library", version.ref = "agp" } # ------------------------------------------------------------------- # Kotlin # ------------------------------------------------------------------- -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +# ------------------------------------------------------------------- +# Room +# ------------------------------------------------------------------- +room = { id = "androidx.room", version.ref = "room" } + # ------------------------------------------------------------------- # KSP # ------------------------------------------------------------------- @@ -352,7 +361,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } # ------------------------------------------------------------------- firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase-appdistribution" } firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" } -play-services = { id = "com.google.gms.google-services", version.ref = "play-services" } +google-services = { id = "com.google.gms.google-services", version.ref = "google-services-plugin" } gradle-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "gradle-secrets" } # ------------------------------------------------------------------- @@ -374,7 +383,7 @@ test-logger = { id = "com.adarshr.test-logger", version.ref = "test-logger" } # ------------------------------------------------------------------- android-versioning = { id = "com.raxdenstudios.android-versioning", version.ref = "android-versioning" } android-publish-library = { id = "com.raxdenstudios.android-publish-library", version.ref = "android-publish-library" } -publish-platform = { id = "com.raxdenstudios.publish-platform", version.ref = "publish-platform" } +android-publish-platform = { id = "com.raxdenstudios.android-publish-platform", version.ref = "android-publish-platform" } nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } nmcp = { id = "com.gradleup.nmcp", version.ref = "nmcp" } @@ -406,9 +415,10 @@ android-material = [ ] android-compose = [ + "androidx-core-ktx", "androidx-compose-bom", "androidx-compose-activity", - "androidx-compose-material", + "androidx-compose-material3", "androidx-compose-material-icons-extended", "androidx-compose-navigation", "kotlinx-serialization-json", @@ -458,6 +468,13 @@ hilt = [ "hilt-compiler", ] +koin = [ + "koin-android", + "koin-compose", + "koin-workmanager", + "koin-compose-viewmodel", +] + room = [ "room-ktx", "room-runtime", @@ -486,7 +503,7 @@ retrofit2 = [ ] test = [ - "androidx-test-core", + "androidx-arch-core-testing", "androidx-test-junit-ktx", "androidx-test-rules", "androidx-test-runner", @@ -531,5 +548,5 @@ test-espresso = [ test-mockwebserver = [ "restmock", - "okhttp-mockwebserver", + "okhttp3-mockwebserver", ] \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index cc82b45b..e2430e19 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,7 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.android.versioning) apply false alias(libs.plugins.android.publish.library) apply false - alias(libs.plugins.publish.platform) apply false - alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.android.publish.platform) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.test.logger) alias(libs.plugins.nmcp.aggregation) diff --git a/gradle/libraries.versions.toml b/gradle/libraries.versions.toml index e56096cb..59f4e97f 100644 --- a/gradle/libraries.versions.toml +++ b/gradle/libraries.versions.toml @@ -21,8 +21,8 @@ ksp = "2.3.6" # ------------------------------------------------------------------- # AndroidX # ------------------------------------------------------------------- -androidx-core-ktx = "1.17.0" -androidx-activity-ktx = "1.12.4" +androidx-core-ktx = "1.18.0" +androidx-activity-ktx = "1.13.0" androidx-fragment-ktx = "1.8.9" androidx-preference-ktx = "1.2.1" androidx-constraintlayout = "2.2.1" @@ -35,24 +35,23 @@ androidx-startup = "1.2.0" androidx-workmanager = "2.11.1" androidx-workmanager-hilt = "1.3.0" -androidx-test-core = "2.2.0" +androidx-arch-core-testing = "2.2.0" androidx-test-junit-ktx = "1.3.0" androidx-test-rules = "1.7.0" androidx-test-runner = "1.7.0" -androidx-media = "1.7.1" -androidx-media3-exoplayer = "1.9.2" +androidx-media3 = "1.7.1" +androidx-media3-exoplayer = "1.9.3" # ------------------------------------------------------------------- # Compose # ------------------------------------------------------------------- -androidx-compose = "1.10.4" -androidx-compose-activity = "1.12.4" -androidx-compose-bom = "2026.02.01" +androidx-compose-bom = "2026.03.00" +androidx-compose-activity = "1.13.0" androidx-compose-navigation = "2.9.7" androidx-compose-navigation-hilt = "1.3.0" androidx-compose-ui-constraintlayout = "1.1.1" -androidx-compose-lifecycle = "2.6.0" +androidx-compose-lifecycle = "2.10.0" # ------------------------------------------------------------------- # Google / Material / Firebase @@ -61,7 +60,8 @@ android-material = "1.13.0" firebase = "34.10.0" firebase-appdistribution = "5.2.1" firebase-crashlytics = "3.0.6" -play-services = "4.4.4" +google-services-plugin = "4.4.4" +play-services-location = "21.3.0" gradle-secrets = "2.0.1" # ------------------------------------------------------------------- @@ -74,7 +74,6 @@ kotlinx-serialization-json = "1.10.0" # Networking / JSON / Utils # ------------------------------------------------------------------- okhttp3 = "5.3.2" -okhttp-mockwebserver = "2.7.5" retrofit2 = "3.0.0" network-response-adapter = "5.0.0" gson = "2.13.2" @@ -88,6 +87,7 @@ gradle-play-publisher = "4.0.0" # DI / DB # ------------------------------------------------------------------- hilt = "2.59.2" +koin = "4.1.1" room = "2.8.4" # ------------------------------------------------------------------- @@ -112,36 +112,23 @@ nmcp = "1.4.4" # ------------------------------------------------------------------- # Testing # ------------------------------------------------------------------- -junit = "4.13.2" -junitVersion = "1.2.1" truth = "1.4.5" turbine = "1.2.1" mockk = "1.14.9" espresso = "3.7.0" -roboletric = "4.16.1" +robolectric = "4.16.1" rest-mock = "0.4.4" timber-test = "1.0.1" # ------------------------------------------------------------------- # Your artifacts # ------------------------------------------------------------------- -android-versioning = "0.57.29" -android-publish-library = "0.57.29" -publish-platform = "0.57.29" - -commons-android = "5.0.26" -commons-android-binding = "1.0.10" -commons-android-compose = "1.0.4" -commons-android-test = "5.0.6" -commons-core = "5.2.11" -commons-coroutines = "5.5.6" -commons-coroutines-test = "5.0.7" -commons-network = "1.0.9" -commons-pagination-co = "5.0.6" -commons-permissions = "5.0.10" -commons-preferences = "5.0.8" -commons-threeten = "5.0.7" -commons-threeten-test = "5.0.10" +android-versioning = "0.57.30" +android-publish-library = "0.57.30" +android-publish-platform = "0.57.30" + +commons-bom = "1.0.3" +commons-preferences = "5.0.10" [libraries] @@ -171,7 +158,7 @@ androidx-work-test = { module = "androidx.work:work-testing", version.ref = "and # ------------------------------------------------------------------- # AndroidX - Media3 # ------------------------------------------------------------------- -androidx-media = { module = "androidx.media:media", version.ref = "androidx-media" } +androidx-media = { module = "androidx.media:media", version.ref = "androidx-media3" } androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "androidx-media3-exoplayer" } androidx-media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "androidx-media3-exoplayer" } androidx-media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "androidx-media3-exoplayer" } @@ -183,8 +170,7 @@ androidx-media3-session = { module = "androidx.media3:media3-session", version.r # ------------------------------------------------------------------- androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-compose-activity" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } -androidx-compose-material = { module = "androidx.compose.material:material" } +androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-compose-navigation" } androidx-compose-navigation-hilt = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-compose-navigation-hilt" } @@ -192,10 +178,10 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-constraintlayout = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-compose-ui-constraintlayout" } androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" } -androidx-compose-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } -androidx-compose-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-compose-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-compose-lifecycle" } +androidx-compose-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-compose-lifecycle" } # ------------------------------------------------------------------- # Material @@ -221,9 +207,14 @@ landscapist-placeholder = { module = "com.github.skydoves:landscapist-placeholde # Firebase (use BOM) # ------------------------------------------------------------------- firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase" } -firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" } -firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" } -firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx" } +firebase-analytics = { module = "com.google.firebase:firebase-analytics" } +firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" } +firebase-messaging = { module = "com.google.firebase:firebase-messaging" } + +# ------------------------------------------------------------------- +# Play services +# ------------------------------------------------------------------- +play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "play-services-location" } # ------------------------------------------------------------------- # Hilt @@ -232,6 +223,17 @@ hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } hilt-test = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } +# ------------------------------------------------------------------- +# Koin +# ------------------------------------------------------------------- +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } +koin-workmanager = { module = "io.insert-koin:koin-androidx-workmanager", version.ref = "koin" } +koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" } +koin-navigation = { module = "io.insert-koin:koin-androidx-navigation", version.ref = "koin" } +koin-startup = { module = "io.insert-koin:koin-androidx-startup", version.ref = "koin" } +koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" } +koin-compose-viewmodel-navigation = { module = "io.insert-koin:koin-compose-viewmodel-navigation", version.ref = "koin" } + # ------------------------------------------------------------------- # KotlinX # ------------------------------------------------------------------- @@ -244,7 +246,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa # ------------------------------------------------------------------- okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" } okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3" } -okhttp-mockwebserver = { module = "com.squareup.okhttp:mockwebserver", version.ref = "okhttp-mockwebserver" } +okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp3" } retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" } retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit2" } @@ -257,9 +259,9 @@ network-response-adapter = { module = "com.github.haroldadmin:NetworkResponseAda # ------------------------------------------------------------------- # Room (KSP compiler in usage: ksp(libs.room-compiler)) # ------------------------------------------------------------------- +room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } -room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } room-test = { module = "androidx.room:room-testing", version.ref = "room" } # ------------------------------------------------------------------- @@ -270,7 +272,7 @@ leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.re # ------------------------------------------------------------------- # Testing # ------------------------------------------------------------------- -androidx-test-core = { module = "androidx.arch.core:core-testing", version.ref = "androidx-test-core" } +androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-arch-core-testing" } androidx-test-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-junit-ktx" } androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-rules" } androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" } @@ -279,7 +281,7 @@ espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" } espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso" } -robolectric = { module = "org.robolectric:robolectric", version.ref = "roboletric" } +robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" } truth = { module = "com.google.truth:truth", version.ref = "truth" } @@ -292,23 +294,26 @@ restmock = { module = "com.github.andrzejchm.RESTMock:android", version.ref = "r # ------------------------------------------------------------------- timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } threetenabp = { module = "com.jakewharton.threetenabp:threetenabp", version.ref = "threetenabp" } +gander-debug = { module = "com.ashokvarma.android:gander-imdb", version.ref = "gander" } +gander-release = { module = "com.ashokvarma.android:gander-no-op", version.ref = "gander" } # ------------------------------------------------------------------- # Your published libs # ------------------------------------------------------------------- -commons-android = { module = "com.raxdenstudios:commons-android", version.ref = "commons-android" } -commons-android-binding = { module = "com.raxdenstudios:commons-android-binding", version.ref = "commons-android-binding" } -commons-android-compose = { module = "com.raxdenstudios:commons-android-compose", version.ref = "commons-android-compose" } -commons-android-test = { module = "com.raxdenstudios:commons-android-test", version.ref = "commons-android-test" } -commons-core = { module = "com.raxdenstudios:commons-core", version.ref = "commons-core" } -commons-coroutines = { module = "com.raxdenstudios:commons-coroutines", version.ref = "commons-coroutines" } -commons-coroutines-test = { module = "com.raxdenstudios:commons-coroutines-test", version.ref = "commons-coroutines-test" } -commons-network = { module = "com.raxdenstudios:commons-network", version.ref = "commons-network" } -commons-pagination-co = { module = "com.raxdenstudios:commons-pagination-co", version.ref = "commons-pagination-co" } -commons-permissions = { module = "com.raxdenstudios:commons-permissions", version.ref = "commons-permissions" } +commons-bom = { module = "com.raxdenstudios:commons-bom", version.ref = "commons-bom" } +commons-android = { module = "com.raxdenstudios:commons-android" } +commons-android-binding = { module = "com.raxdenstudios:commons-android-binding" } +commons-android-compose = { module = "com.raxdenstudios:commons-android-compose" } +commons-android-test = { module = "com.raxdenstudios:commons-android-test" } +commons-core = { module = "com.raxdenstudios:commons-core" } +commons-coroutines = { module = "com.raxdenstudios:commons-coroutines" } +commons-coroutines-test = { module = "com.raxdenstudios:commons-coroutines-test" } +commons-network = { module = "com.raxdenstudios:commons-network" } +commons-pagination-co = { module = "com.raxdenstudios:commons-pagination-co" } +commons-permissions = { module = "com.raxdenstudios:commons-permissions" } commons-preferences = { module = "com.raxdenstudios:commons-preferences", version.ref = "commons-preferences" } -commons-threetenabp = { module = "com.raxdenstudios:commons-threeten", version.ref = "commons-threeten" } -commons-threetenabp-test = { module = "com.raxdenstudios:commons-threeten-test", version.ref = "commons-threeten-test" } +commons-threetenabp = { module = "com.raxdenstudios:commons-threeten" } +commons-threetenabp-test = { module = "com.raxdenstudios:commons-threeten-test" } # ------------------------------------------------------------------- # Build-logic / plugin classpath dependencies (included build) @@ -337,11 +342,15 @@ android-library = { id = "com.android.library", version.ref = "agp" } # ------------------------------------------------------------------- # Kotlin # ------------------------------------------------------------------- -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +# ------------------------------------------------------------------- +# Room +# ------------------------------------------------------------------- +room = { id = "androidx.room", version.ref = "room" } + # ------------------------------------------------------------------- # KSP # ------------------------------------------------------------------- @@ -352,7 +361,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } # ------------------------------------------------------------------- firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase-appdistribution" } firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" } -play-services = { id = "com.google.gms.google-services", version.ref = "play-services" } +google-services = { id = "com.google.gms.google-services", version.ref = "google-services-plugin" } gradle-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "gradle-secrets" } # ------------------------------------------------------------------- @@ -374,7 +383,7 @@ test-logger = { id = "com.adarshr.test-logger", version.ref = "test-logger" } # ------------------------------------------------------------------- android-versioning = { id = "com.raxdenstudios.android-versioning", version.ref = "android-versioning" } android-publish-library = { id = "com.raxdenstudios.android-publish-library", version.ref = "android-publish-library" } -publish-platform = { id = "com.raxdenstudios.publish-platform", version.ref = "publish-platform" } +android-publish-platform = { id = "com.raxdenstudios.android-publish-platform", version.ref = "android-publish-platform" } nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } nmcp = { id = "com.gradleup.nmcp", version.ref = "nmcp" } @@ -406,9 +415,10 @@ android-material = [ ] android-compose = [ + "androidx-core-ktx", "androidx-compose-bom", "androidx-compose-activity", - "androidx-compose-material", + "androidx-compose-material3", "androidx-compose-material-icons-extended", "androidx-compose-navigation", "kotlinx-serialization-json", @@ -458,6 +468,13 @@ hilt = [ "hilt-compiler", ] +koin = [ + "koin-android", + "koin-compose", + "koin-workmanager", + "koin-compose-viewmodel", +] + room = [ "room-ktx", "room-runtime", @@ -486,7 +503,7 @@ retrofit2 = [ ] test = [ - "androidx-test-core", + "androidx-arch-core-testing", "androidx-test-junit-ktx", "androidx-test-rules", "androidx-test-runner", @@ -531,5 +548,5 @@ test-espresso = [ test-mockwebserver = [ "restmock", - "okhttp-mockwebserver", + "okhttp3-mockwebserver", ] \ No newline at end of file diff --git a/libraries/android-compose/build.gradle.kts b/libraries/android-compose/build.gradle.kts index 6aee83e5..594a6a02 100644 --- a/libraries/android-compose/build.gradle.kts +++ b/libraries/android-compose/build.gradle.kts @@ -31,5 +31,5 @@ dependencies { api(projects.libraries.android) api(platform(libs.androidx.compose.bom)) - api(libs.androidx.compose.material) + api(libs.androidx.compose.material3) } diff --git a/libraries/core/build.gradle.kts b/libraries/core/build.gradle.kts index 59ede4aa..f9dacc7e 100644 --- a/libraries/core/build.gradle.kts +++ b/libraries/core/build.gradle.kts @@ -30,7 +30,7 @@ publishLibrary { dependencies { api(libs.timber) - testImplementation(libs.androidx.test.core) + testImplementation(libs.androidx.arch.core.testing) testImplementation(libs.truth) testImplementation(libs.mockk.android) } diff --git a/libraries/coroutines-test/build.gradle.kts b/libraries/coroutines-test/build.gradle.kts index 537ece46..68eb721e 100644 --- a/libraries/coroutines-test/build.gradle.kts +++ b/libraries/coroutines-test/build.gradle.kts @@ -28,7 +28,7 @@ publishLibrary { } dependencies { - api(libs.androidx.test.core) + api(libs.androidx.arch.core.testing) api(libs.coroutines.test) api(libs.turbine) } diff --git a/libraries/pagination/build.gradle.kts b/libraries/pagination/build.gradle.kts index 5cf0a64c..ad9e41bc 100644 --- a/libraries/pagination/build.gradle.kts +++ b/libraries/pagination/build.gradle.kts @@ -30,5 +30,5 @@ publishLibrary { dependencies { implementation(libs.android.material) implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.compose.material) + implementation(libs.androidx.compose.material3) } diff --git a/libraries/preferences/build.gradle.kts b/libraries/preferences/build.gradle.kts index 4c2f2e3c..4a01fef1 100644 --- a/libraries/preferences/build.gradle.kts +++ b/libraries/preferences/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { api(libs.androidx.preference.ktx) api(libs.gson) - testImplementation(libs.androidx.test.core) + testImplementation(libs.androidx.arch.core.testing) testImplementation(libs.androidx.test.junit.ktx) testImplementation(libs.robolectric) } diff --git a/libraries/threeten-test/build.gradle.kts b/libraries/threeten-test/build.gradle.kts index a533517b..8af60dd5 100644 --- a/libraries/threeten-test/build.gradle.kts +++ b/libraries/threeten-test/build.gradle.kts @@ -30,5 +30,5 @@ publishLibrary { dependencies { api(libs.threetenabp) - api(libs.androidx.test.core) + api(libs.androidx.arch.core.testing) }