chore(gradle): rename toml file keys for dependencies.

GerardPaligot · Mar 7, 2024 · 340d60e · 340d60e
1 parent af67ed3
commit 340d60e
Show file tree

Hide file tree

Showing 30 changed files with 174 additions and 173 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -79,16 +79,16 @@ dependencies {
     implementation(projects.shared.coreDi)
     implementation(libs.settings)
 
-    implementation(libs.android.material)
+    implementation(libs.google.material)
 
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.browser)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3.windowsizeclass)
     implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.activity)
-    implementation(libs.androidx.compose.navigation)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profile)
     implementation(libs.androidx.workmanager.ktx)
 

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 
 dependencies {
     implementation(projects.shared.models)
-    implementation(libs.kotlinx.coroutines)
-    implementation(libs.kotlinx.datetime)
+    implementation(libs.jetbrains.kotlinx.coroutines)
+    implementation(libs.jetbrains.kotlinx.datetime)
 
     implementation(libs.ktor.server.core)
     implementation(libs.ktor.server.netty)
@@ -27,8 +27,8 @@ dependencies {
 
     implementation(libs.ktor.serialization.json)
 
-    implementation(libs.apache.batik.transcoder)
-    implementation(libs.apache.batik.codec)
+    implementation(libs.apache.xmlgraphics.batik.transcoder)
+    implementation(libs.apache.xmlgraphics.batik.codec)
 
     implementation(libs.logback)
 

diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 dependencies {
     implementation(gradleApi())
     implementation(libs.android.gradlePlugin)
-    implementation(libs.kotlin.gradlePlugin)
+    implementation(libs.jetbrains.kotlin.gradlePlugin)
     implementation(libs.ktlint.gradlePlugin)
     implementation(libs.detekt.gradlePlugin)
 }

diff --git a/build-logic/plugins/src/main/kotlin/extensions/ComposeAndroid.kt b/build-logic/plugins/src/main/kotlin/extensions/ComposeAndroid.kt
@@ -18,7 +18,7 @@ internal fun Project.configureAndroidCompose(
         }
 
         composeOptions {
-            kotlinCompilerExtensionVersion = libs.findVersion("composeCompiler").get().toString()
+            kotlinCompilerExtensionVersion = libs.findVersion("androidx-compose-compiler").get().toString()
         }
     }
     dependencies {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,10 +5,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath(libs.kotlin.gradlePlugin)
-        classpath(libs.kotlin.serialization)
-        classpath(libs.kmp.native.coroutines)
-        classpath(libs.sqldelight.gradlePlugin)
+        classpath(libs.jetbrains.kotlin.gradlePlugin)
+        classpath(libs.jetbrains.kotlin.serialization.gradlePlugin)
+        classpath(libs.kmp.nativecoroutines.gradlePlugin)
+        classpath(libs.cash.sqldelight.gradlePlugin)
         classpath(libs.google.services.gradlePlugin)
         classpath(libs.google.firebase.crashlytics.gradlePlugin)
         classpath(libs.android.gradlePlugin)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/shared/core/build.gradle.kts b/shared/core/build.gradle.kts
@@ -38,7 +38,7 @@ kotlin {
             dependencies {
                 api(projects.shared.models)
                 api(projects.shared.uiModels)
-                implementation(libs.kotlinx.coroutines)
+                implementation(libs.jetbrains.kotlinx.coroutines)
 
                 implementation(libs.ktor.client.core)
                 implementation(libs.ktor.client.json)
@@ -47,12 +47,12 @@ kotlin {
                 implementation(libs.ktor.client.negotiation)
                 implementation(libs.ktor.serialization.json)
 
-                implementation(libs.kotlinx.datetime)
-                implementation(libs.kotlinx.collections)
+                implementation(libs.jetbrains.kotlinx.datetime)
+                implementation(libs.jetbrains.kotlinx.collections)
 
-                implementation(libs.sqldelight.runtime)
-                implementation(libs.sqldelight.coroutines)
-                implementation(libs.okio)
+                implementation(libs.cash.sqldelight.runtime)
+                implementation(libs.cash.sqldelight.coroutines)
+                implementation(libs.squareup.okio)
 
                 api(libs.settings)
                 implementation(libs.settings.coroutines)
@@ -68,9 +68,9 @@ kotlin {
             dependencies {
                 implementation(projects.themeM3.style.theme)
                 implementation(libs.ktor.client.android)
-                implementation(libs.sqldelight.android)
-                implementation(libs.zxing)
-                implementation(libs.zxing.android)
+                implementation(libs.cash.sqldelight.android)
+                implementation(libs.google.zxing)
+                implementation(libs.zxing.android.embedded)
             }
         }
         val androidUnitTest by getting {
@@ -90,7 +90,7 @@ kotlin {
                 iosSimulatorArm64Main.dependsOn(this)
                 dependencies {
                     implementation(libs.ktor.client.ios)
-                    implementation(libs.sqldelight.native)
+                    implementation(libs.cash.sqldelight.native)
                 }
             }
             val iosX64Test by getting

diff --git a/shared/models/build.gradle.kts b/shared/models/build.gradle.kts
@@ -24,7 +24,7 @@ kotlin {
             dependencies {
                 implementation(libs.ktor.client.serialization)
                 implementation(libs.ktor.serialization.json)
-                implementation(libs.kotlinx.datetime)
+                implementation(libs.jetbrains.kotlinx.datetime)
             }
         }
         val androidMain by getting

diff --git a/shared/ui-models/build.gradle.kts b/shared/ui-models/build.gradle.kts
@@ -23,7 +23,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(libs.kotlinx.collections)
+                implementation(libs.jetbrains.kotlinx.collections)
             }
         }
         val androidMain by getting

diff --git a/theme-m3/event-list/event-list-feature/build.gradle.kts b/theme-m3/event-list/event-list-feature/build.gradle.kts
@@ -16,14 +16,14 @@ dependencies {
 
     implementation(libs.koin.androidx.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.vm)
+    implementation(libs.androidx.lifecycle.viewmodel)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/event-list/event-list-ui/build.gradle.kts b/theme-m3/event-list/event-list-ui/build.gradle.kts
@@ -16,5 +16,5 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.tooling)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 }
diff --git a/theme-m3/infos/infos-feature/build.gradle.kts b/theme-m3/infos/infos-feature/build.gradle.kts
@@ -16,15 +16,15 @@ dependencies {
 
     implementation(libs.koin.androidx.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.vm)
-    implementation(libs.compose.richtext)
+    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(libs.richtext.commonmark)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/infos/infos-ui/build.gradle.kts b/theme-m3/infos/infos-ui/build.gradle.kts
@@ -14,11 +14,11 @@ dependencies {
     implementation(projects.themeM3.navigation)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.icons)
-    implementation(libs.compose.richtext)
+    implementation(libs.richtext.commonmark)
 }
diff --git a/theme-m3/main/main/build.gradle.kts b/theme-m3/main/main/build.gradle.kts
@@ -32,10 +32,10 @@ dependencies {
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
     implementation(libs.androidx.compose.runtime)
-    implementation(libs.androidx.compose.navigation)
+    implementation(libs.androidx.navigation.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/networking/networking-feature/build.gradle.kts b/theme-m3/networking/networking-feature/build.gradle.kts
@@ -18,14 +18,14 @@ dependencies {
 
     implementation(libs.koin.androidx.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.vm)
+    implementation(libs.androidx.lifecycle.viewmodel)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/networking/networking-screens/build.gradle.kts b/theme-m3/networking/networking-screens/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     implementation(projects.themeM3.style.networking)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/networking/networking-ui/build.gradle.kts b/theme-m3/networking/networking-ui/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation(projects.themeM3.navigation)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/partners/partners-feature/build.gradle.kts b/theme-m3/partners/partners-feature/build.gradle.kts
@@ -18,15 +18,15 @@ dependencies {
 
     implementation(libs.koin.androidx.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.vm)
+    implementation(libs.androidx.lifecycle.viewmodel)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/partners/partners-screens/build.gradle.kts b/theme-m3/partners/partners-screens/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     implementation(projects.themeM3.style.partners)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/partners/partners-ui/build.gradle.kts b/theme-m3/partners/partners-ui/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation(projects.themeM3.style.partners)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/schedules/schedules-feature/build.gradle.kts b/theme-m3/schedules/schedules-feature/build.gradle.kts
@@ -18,16 +18,16 @@ dependencies {
 
     implementation(libs.koin.androidx.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.vm)
+    implementation(libs.androidx.lifecycle.viewmodel)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/schedules/schedules-screens/build.gradle.kts b/theme-m3/schedules/schedules-screens/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation(projects.themeM3.style.speakers)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/schedules/schedules-ui/build.gradle.kts b/theme-m3/schedules/schedules-ui/build.gradle.kts
@@ -16,12 +16,12 @@ dependencies {
     implementation(projects.themeM3.style.speakers)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.icons)
-    implementation(libs.compose.richtext)
-    api(libs.compose.openfeedback.m3)
+    implementation(libs.richtext.commonmark)
+    api(libs.openfeedback.m3)
 }
diff --git a/theme-m3/speakers/speakers-feature/build.gradle.kts b/theme-m3/speakers/speakers-feature/build.gradle.kts
@@ -16,15 +16,15 @@ dependencies {
 
     implementation(libs.koin.androidx.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.vm)
+    implementation(libs.androidx.lifecycle.viewmodel)
 
-    implementation(platform(libs.google.firebase))
+    implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
 }
diff --git a/theme-m3/speakers/speakers-screens/build.gradle.kts b/theme-m3/speakers/speakers-screens/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation(projects.themeM3.style.speakers)
     implementation(projects.themeM3.style.theme)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/speakers/speakers-ui/build.gradle.kts b/theme-m3/speakers/speakers-ui/build.gradle.kts
@@ -20,5 +20,5 @@ dependencies {
 
     implementation(libs.coil.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 }
diff --git a/theme-m3/style/schedules/build.gradle.kts b/theme-m3/style/schedules/build.gradle.kts
@@ -17,5 +17,5 @@ dependencies {
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.icons)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 }
diff --git a/theme-m3/style/speakers/build.gradle.kts b/theme-m3/style/speakers/build.gradle.kts
@@ -18,5 +18,5 @@ dependencies {
 
     implementation(libs.coil.compose)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 }
diff --git a/theme-m3/style/theme/build.gradle.kts b/theme-m3/style/theme/build.gradle.kts
@@ -14,11 +14,11 @@ dependencies {
     implementation(libs.androidx.compose.tooling)
     implementation(libs.androidx.compose.icons)
 
-    implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.placeholder)
+    implementation(libs.google.accompanist.permissions)
+    implementation(libs.google.accompanist.placeholder)
 
-    implementation(libs.kotlinx.collections)
+    implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(libs.compose.awesome.font)
-    implementation(libs.compose.richtext)
+    implementation(libs.font.awesome)
+    implementation(libs.richtext.commonmark)
 }