build: Move the Log4j Kotlin API dependency to Kotlin conventions

sschuberth · sschuberth · commit b1760ca09d6c · 2023-10-16T09:07:18.000+02:00
All of ORT's Kotlin projects should use this Kotlin logger API.

Signed-off-by: Sebastian Schuberth &lt;sschuberth@gmail.com&gt;
diff --git a/buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts
@@ -101,6 +101,8 @@ dependencies {
     "detektPlugins"(project(":detekt-rules"))
 
     "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:${libs.versions.detektPlugin.get()}")
+
+    implementation(libs.log4jApiKotlin)
 }
 
 detekt {
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
@@ -36,7 +36,6 @@ dependencies {
     implementation(project(":utils:ort-utils"))
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
     implementation(libs.logbackClassic)
     implementation(libs.mordant)
     implementation(libs.slf4j)
diff --git a/clients/github-graphql/build.gradle.kts b/clients/github-graphql/build.gradle.kts
@@ -48,7 +48,6 @@ dependencies {
 
     implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.graphQlKtorClient)
-    implementation(libs.log4jApiKotlin)
 
     testImplementation(libs.wiremock)
 }
diff --git a/plugins/commands/advisor/build.gradle.kts b/plugins/commands/advisor/build.gradle.kts
@@ -32,5 +32,4 @@ dependencies {
 
     implementation(libs.clikt)
     implementation(libs.kotlinxCoroutines)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/analyzer/build.gradle.kts b/plugins/commands/analyzer/build.gradle.kts
@@ -34,5 +34,4 @@ dependencies {
     implementation(project(":utils:ort-utils"))
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/downloader/build.gradle.kts b/plugins/commands/downloader/build.gradle.kts
@@ -33,5 +33,4 @@ dependencies {
 
     implementation(libs.clikt)
     implementation(libs.kotlinxCoroutines)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/evaluator/build.gradle.kts b/plugins/commands/evaluator/build.gradle.kts
@@ -35,5 +35,4 @@ dependencies {
     implementation(project(":utils:spdx-utils"))
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/notifier/build.gradle.kts b/plugins/commands/notifier/build.gradle.kts
@@ -31,5 +31,4 @@ dependencies {
     implementation(project(":utils:ort-utils"))
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/reporter/build.gradle.kts b/plugins/commands/reporter/build.gradle.kts
@@ -35,5 +35,4 @@ dependencies {
 
     implementation(libs.clikt)
     implementation(libs.kotlinxCoroutines)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/requirements/build.gradle.kts b/plugins/commands/requirements/build.gradle.kts
@@ -36,7 +36,6 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
     implementation(libs.reflections)
     implementation(libs.semver4j)
 
diff --git a/plugins/commands/scanner/build.gradle.kts b/plugins/commands/scanner/build.gradle.kts
@@ -34,5 +34,4 @@ dependencies {
 
     implementation(libs.clikt)
     implementation(libs.kotlinxCoroutines)
-    implementation(libs.log4jApiKotlin)
 }
diff --git a/plugins/commands/upload-curations/build.gradle.kts b/plugins/commands/upload-curations/build.gradle.kts
@@ -32,6 +32,5 @@ dependencies {
     implementation(project(":utils:spdx-utils"))
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
     implementation(libs.okhttp)
 }
diff --git a/plugins/commands/upload-result-to-postgres/build.gradle.kts b/plugins/commands/upload-result-to-postgres/build.gradle.kts
@@ -32,7 +32,6 @@ dependencies {
 
     implementation(libs.bundles.exposed)
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
 
     runtimeOnly(libs.postgres)
 }
diff --git a/plugins/commands/upload-result-to-sw360/build.gradle.kts b/plugins/commands/upload-result-to-sw360/build.gradle.kts
@@ -33,6 +33,5 @@ dependencies {
     implementation(project(":utils:spdx-utils"))
 
     implementation(libs.clikt)
-    implementation(libs.log4jApiKotlin)
     implementation(libs.sw360Client)
 }
diff --git a/plugins/package-managers/cargo/build.gradle.kts b/plugins/package-managers/cargo/build.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     implementation(project(":utils:spdx-utils"))
 
     implementation(libs.jacksonDatabind)
-    implementation(libs.log4jApiKotlin)
     implementation(libs.toml4j)
     constraints {
         implementation("com.google.code.gson:gson:2.10.1") {
diff --git a/plugins/package-managers/cocoapods/build.gradle.kts b/plugins/package-managers/cocoapods/build.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
     implementation(libs.jacksonCore)
     implementation(libs.jacksonDatabind)
     implementation(libs.jacksonDataformatYaml)
-    implementation(libs.log4jApiKotlin)
 
     funTestImplementation(testFixtures(project(":analyzer")))
 }
diff --git a/plugins/package-managers/composer/build.gradle.kts b/plugins/package-managers/composer/build.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     implementation(project(":utils:spdx-utils"))
 
     implementation(libs.jacksonDatabind)
-    implementation(libs.log4jApiKotlin)
 
     funTestImplementation(testFixtures(project(":analyzer")))
 }
diff --git a/plugins/package-managers/gradle-inspector/build.gradle.kts b/plugins/package-managers/gradle-inspector/build.gradle.kts
@@ -41,8 +41,6 @@ dependencies {
     // Use the latest version that is not affected by https://github.com/gradle/gradle/issues/23208.
     implementation("org.gradle:gradle-tooling-api:7.4.2")
 
-    implementation(libs.log4jApiKotlin)
-
     funTestImplementation(testFixtures(project(":analyzer")))
 }
 
diff --git a/plugins/package-managers/spdx/build.gradle.kts b/plugins/package-managers/spdx/build.gradle.kts
@@ -33,7 +33,6 @@ dependencies {
 
     implementation(libs.jacksonCore)
     implementation(libs.jacksonDatabind)
-    implementation(libs.log4jApiKotlin)
     implementation(libs.okhttp)
 
     funTestImplementation(testFixtures(project(":analyzer")))
diff --git a/plugins/package-managers/stack/build.gradle.kts b/plugins/package-managers/stack/build.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
     implementation(libs.jacksonCore)
     implementation(libs.jacksonDatabind)
     implementation(libs.jacksonModuleKotlin)
-    implementation(libs.log4jApiKotlin)
 
     funTestImplementation(testFixtures(project(":analyzer")))
 }
diff --git a/plugins/package-managers/unmanaged/build.gradle.kts b/plugins/package-managers/unmanaged/build.gradle.kts
@@ -29,7 +29,5 @@ dependencies {
     implementation(project(":downloader"))
     implementation(project(":utils:ort-utils"))
 
-    implementation(libs.log4jApiKotlin)
-
     funTestImplementation(testFixtures(project(":analyzer")))
 }
diff --git a/plugins/reporters/gitlab/build.gradle.kts b/plugins/reporters/gitlab/build.gradle.kts
@@ -36,7 +36,6 @@ dependencies {
     implementation(project(":utils:spdx-utils"))
 
     implementation(libs.bundles.kotlinxSerialization)
-    implementation(libs.log4jApiKotlin)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ dependencies {`
`101`	`101`	`"detektPlugins"(project(":detekt-rules"))`
`102`	`102`
`103`	`103`	`"detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:${libs.versions.detektPlugin.get()}")`
	`104`	`+`
	`105`	`+ implementation(libs.log4jApiKotlin)`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`detekt {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ dependencies {`
`48`	`48`
`49`	`49`	`implementation(libs.bundles.kotlinxSerialization)`
`50`	`50`	`implementation(libs.graphQlKtorClient)`
`51`		`- implementation(libs.log4jApiKotlin)`
`52`	`51`
`53`	`52`	`testImplementation(libs.wiremock)`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,4 @@ dependencies {`
`32`	`32`
`33`	`33`	`implementation(libs.clikt)`
`34`	`34`	`implementation(libs.kotlinxCoroutines)`
`35`		`- implementation(libs.log4jApiKotlin)`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,4 @@ dependencies {`
`34`	`34`	`implementation(project(":utils:ort-utils"))`
`35`	`35`
`36`	`36`	`implementation(libs.clikt)`
`37`		`- implementation(libs.log4jApiKotlin)`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,4 @@ dependencies {`
`33`	`33`
`34`	`34`	`implementation(libs.clikt)`
`35`	`35`	`implementation(libs.kotlinxCoroutines)`
`36`		`- implementation(libs.log4jApiKotlin)`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,4 @@ dependencies {`
`35`	`35`	`implementation(project(":utils:spdx-utils"))`
`36`	`36`
`37`	`37`	`implementation(libs.clikt)`
`38`		`- implementation(libs.log4jApiKotlin)`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,4 @@ dependencies {`
`31`	`31`	`implementation(project(":utils:ort-utils"))`
`32`	`32`
`33`	`33`	`implementation(libs.clikt)`
`34`		`- implementation(libs.log4jApiKotlin)`
`35`	`34`	`}`