build(Gradle): Use dashes to group dependencies

Use dashes in `libs.versions.toml` to group dependencies to improve overview. For example, `libs.jacksonDataformatXml` becomes `libs.jackson.dataformat.xml`. Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@bosch.io>
oss-review-toolkit · Jan 20, 2024 · 6d35192 · 6d35192
1 parent 81d11a2
commit 6d35192
Show file tree

Hide file tree

Showing 58 changed files with 192 additions and 190 deletions.
diff --git a/advisor/build.gradle.kts b/advisor/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
 
     implementation(projects.utils.ortUtils)
 
-    implementation(libs.kotlinxCoroutines)
+    implementation(libs.kotlinx.coroutines)
 
     testImplementation(libs.mockk)
 }
diff --git a/analyzer/build.gradle.kts b/analyzer/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
     implementation(projects.downloader)
     implementation(projects.utils.ortUtils)
 
-    implementation(libs.kotlinxCoroutines)
+    implementation(libs.kotlinx.coroutines)
 
     funTestImplementation(platform(projects.plugins.packageManagers))
 
@@ -40,6 +40,6 @@ dependencies {
 
     testFixturesImplementation(projects.utils.testUtils)
 
-    testFixturesImplementation(libs.kotestAssertionsCore)
-    testFixturesImplementation(libs.kotestRunnerJunit5)
+    testFixturesImplementation(libs.kotest.assertions.core)
+    testFixturesImplementation(libs.kotest.runner.junit5)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -39,12 +39,12 @@ repositories {
 dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 
-    implementation(libs.detektPlugin)
-    implementation(libs.dokkatooPlugin)
-    implementation(libs.graalVmNativeImagePlugin)
     implementation(libs.jgit)
-    implementation(libs.kotlinPlugin)
-    implementation(libs.mavenPublishPlugin)
+    implementation(libs.plugin.detekt)
+    implementation(libs.plugin.dokkatoo)
+    implementation(libs.plugin.graalVmNativeImage)
+    implementation(libs.plugin.kotlin)
+    implementation(libs.plugin.mavenPublish)
 }
 
 val javaVersion = JavaVersion.current()

diff --git a/buildSrc/src/main/kotlin/ort-application-conventions.gradle.kts b/buildSrc/src/main/kotlin/ort-application-conventions.gradle.kts
@@ -130,7 +130,7 @@ graalvmNative {
 dependencies {
     implementation(libs.logbackClassic)
 
-    runtimeOnly(libs.log4jApiToSlf4j)
+    runtimeOnly(libs.log4j.api.slf4j)
 }
 
 tasks.named<BuildNativeImageTask>("nativeCompile") {

diff --git a/buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts
@@ -61,8 +61,8 @@ testing {
             dependencies {
                 implementation(project(":utils:test-utils"))
 
-                implementation(libs.kotestAssertionsCore)
-                implementation(libs.kotestRunnerJunit5)
+                implementation(libs.kotest.assertions.core)
+                implementation(libs.kotest.runner.junit5)
             }
         }
 
@@ -99,7 +99,7 @@ dependencies {
 
     "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:${libs.versions.detektPlugin.get()}")
 
-    implementation(libs.log4jApiKotlin)
+    implementation(libs.log4j.api.kotlin)
 }
 
 detekt {

diff --git a/clients/clearly-defined/build.gradle.kts b/clients/clearly-defined/build.gradle.kts
@@ -32,9 +32,9 @@ dependencies {
     api(libs.retrofit)
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.kotlinxCoroutines)
-    implementation(libs.retrofitConverterKotlinxSerialization)
-    implementation(libs.retrofitConverterScalars)
+    implementation(libs.kotlinx.coroutines)
+    implementation(libs.retrofit.converter.kotlinxSerialization)
+    implementation(libs.retrofit.converter.scalars)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/clients/fossid-webapp/build.gradle.kts b/clients/fossid-webapp/build.gradle.kts
@@ -26,9 +26,9 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.jacksonModuleKotlin)
-    implementation(libs.kotlinxCoroutines)
-    implementation(libs.retrofitConverterJackson)
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.kotlinx.coroutines)
+    implementation(libs.retrofit.converter.jackson)
 
     testImplementation(libs.mockk)
     testImplementation(libs.wiremock)

diff --git a/clients/github-graphql/build.gradle.kts b/clients/github-graphql/build.gradle.kts
@@ -44,7 +44,7 @@ graphql {
 }
 
 dependencies {
-    api(libs.ktorClientCore)
+    api(libs.ktor.client.core)
 
     implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.graphQlKtorClient)

diff --git a/clients/nexus-iq/build.gradle.kts b/clients/nexus-iq/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     api(libs.retrofit)
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.retrofitConverterKotlinxSerialization)
+    implementation(libs.retrofit.converter.kotlinxSerialization)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/clients/oss-index/build.gradle.kts b/clients/oss-index/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     api(libs.retrofit)
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.retrofitConverterKotlinxSerialization)
+    implementation(libs.retrofit.converter.kotlinxSerialization)
 }
diff --git a/clients/osv/build.gradle.kts b/clients/osv/build.gradle.kts
@@ -32,10 +32,10 @@ dependencies {
     api(libs.retrofit)
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.retrofitConverterKotlinxSerialization)
-    implementation(libs.retrofitConverterScalars)
+    implementation(libs.retrofit.converter.kotlinxSerialization)
+    implementation(libs.retrofit.converter.scalars)
 
-    testImplementation(libs.kotestAssertionsJson)
+    testImplementation(libs.kotest.assertions.json)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/clients/scanoss/build.gradle.kts b/clients/scanoss/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     api(libs.retrofit)
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.retrofitConverterKotlinxSerialization)
+    implementation(libs.retrofit.converter.kotlinxSerialization)
 
     testImplementation(libs.wiremock)
 }

diff --git a/clients/vulnerable-code/build.gradle.kts b/clients/vulnerable-code/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     api(libs.retrofit)
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.retrofitConverterKotlinxSerialization)
+    implementation(libs.retrofit.converter.kotlinxSerialization)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/detekt-rules/build.gradle.kts b/detekt-rules/build.gradle.kts
@@ -26,10 +26,10 @@ plugins {
 }
 
 dependencies {
-    compileOnly(libs.detektApi)
+    compileOnly(libs.detekt.api)
 
-    testImplementation(libs.detektApi)
-    testImplementation(libs.detektTest)
+    testImplementation(libs.detekt.api)
+    testImplementation(libs.detekt.test)
 }
 
 configurations.all {