refactor(Gradle): Remove the kotlinxSerialization bundle

Be explicit about the serializers to use. This is a preparation for modules that do not require JSON serialization. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Jul 1, 2024 · 8ea4205 · 8ea4205
1 parent 73b579c
commit 8ea4205
Show file tree

Hide file tree

Showing 28 changed files with 54 additions and 28 deletions.
diff --git a/clients/bazel-module-registry/build.gradle.kts b/clients/bazel-module-registry/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.bundles.ks3)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 }
diff --git a/clients/clearly-defined/build.gradle.kts b/clients/clearly-defined/build.gradle.kts
@@ -29,9 +29,10 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.bundles.ks3)
     implementation(libs.kotlinx.coroutines)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
     implementation(libs.retrofit.converter.scalars)
 }
diff --git a/clients/dos/build.gradle.kts b/clients/dos/build.gradle.kts
@@ -32,7 +32,8 @@ dependencies {
     implementation(projects.model)
     implementation(projects.utils.commonUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.log4j.api.kotlin)
     implementation(libs.okhttp.loggingInterceptor)
     implementation(libs.retrofit.converter.kotlinxSerialization)

diff --git a/clients/github-graphql/build.gradle.kts b/clients/github-graphql/build.gradle.kts
@@ -46,8 +46,9 @@ graphql {
 dependencies {
     api(libs.ktor.client.core)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.graphQlKtorClient)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.wiremock)
 }
diff --git a/clients/nexus-iq/build.gradle.kts b/clients/nexus-iq/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.bundles.ks3)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 }
diff --git a/clients/oss-index/build.gradle.kts b/clients/oss-index/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 }
diff --git a/clients/osv/build.gradle.kts b/clients/osv/build.gradle.kts
@@ -29,8 +29,9 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.bundles.ks3)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
     implementation(libs.retrofit.converter.scalars)
 

diff --git a/clients/scanoss/build.gradle.kts b/clients/scanoss/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 
     testImplementation(libs.wiremock)

diff --git a/clients/vulnerable-code/build.gradle.kts b/clients/vulnerable-code/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     api(libs.okhttp)
     api(libs.retrofit)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 }
diff --git a/evaluator/build.gradle.kts b/evaluator/build.gradle.kts
@@ -38,7 +38,8 @@ dependencies {
 
     implementation("org.jetbrains.kotlin:kotlin-scripting-common")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host")
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.mockk)
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -172,6 +172,5 @@ xz = { module = "org.tukaani:xz", version.ref = "xz" }
 [bundles]
 exposed = ["exposed-core", "exposed-dao", "exposed-jdbc", "exposed-javaTime", "exposed-json"]
 hoplite = ["hoplite-core", "hoplite-yaml"]
-kotlinxSerialization = ["kotlinx-serialization-core", "kotlinx-serialization-json"]
 ks3 = ["ks3-jdk", "ks3-standard"]
 mavenResolver = ["maven-resolver-connector-basic", "maven-resolver-transport-file", "maven-resolver-transport-http", "maven-resolver-transport-wagon"]
diff --git a/plugins/advisors/osv/build.gradle.kts b/plugins/advisors/osv/build.gradle.kts
@@ -31,5 +31,6 @@ dependencies {
     implementation(projects.utils.ortUtils)
 
     implementation(libs.cvssCalculator)
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 }
diff --git a/plugins/package-managers/bazel/build.gradle.kts b/plugins/package-managers/bazel/build.gradle.kts
@@ -41,8 +41,9 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.kotlinx.coroutines)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
diff --git a/plugins/package-managers/cargo/build.gradle.kts b/plugins/package-managers/cargo/build.gradle.kts
@@ -40,7 +40,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.serialization.toml)
 
     funTestImplementation(testFixtures(projects.analyzer))

diff --git a/plugins/package-managers/go/build.gradle.kts b/plugins/package-managers/go/build.gradle.kts
@@ -40,7 +40,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
diff --git a/plugins/package-managers/nuget/build.gradle.kts b/plugins/package-managers/nuget/build.gradle.kts
@@ -34,7 +34,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.semver4j)
 
     funTestImplementation(testFixtures(projects.analyzer))

diff --git a/plugins/package-managers/python/build.gradle.kts b/plugins/package-managers/python/build.gradle.kts
@@ -40,7 +40,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
diff --git a/plugins/package-managers/swiftpm/build.gradle.kts b/plugins/package-managers/swiftpm/build.gradle.kts
@@ -40,7 +40,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
diff --git a/plugins/reporters/ctrlx/build.gradle.kts b/plugins/reporters/ctrlx/build.gradle.kts
@@ -32,7 +32,8 @@ dependencies {
     implementation(projects.model)
     implementation(projects.utils.commonUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestImplementation(testFixtures(projects.reporter))
 }
diff --git a/plugins/reporters/gitlab/build.gradle.kts b/plugins/reporters/gitlab/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.bundles.ks3)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 }
diff --git a/plugins/reporters/trustsource/build.gradle.kts b/plugins/reporters/trustsource/build.gradle.kts
@@ -34,7 +34,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestImplementation(testFixtures(projects.reporter))
 

diff --git a/plugins/scanners/askalono/build.gradle.kts b/plugins/scanners/askalono/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     api(projects.model)
     api(projects.scanner)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestApi(testFixtures(projects.scanner))
 }
diff --git a/plugins/scanners/boyterlc/build.gradle.kts b/plugins/scanners/boyterlc/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     api(projects.model)
     api(projects.scanner)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestApi(testFixtures(projects.scanner))
 }
diff --git a/plugins/scanners/dos/build.gradle.kts b/plugins/scanners/dos/build.gradle.kts
@@ -35,8 +35,9 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.kotlinx.coroutines)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.log4j.api)
 
     testImplementation(libs.mockk)

diff --git a/plugins/scanners/licensee/build.gradle.kts b/plugins/scanners/licensee/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     api(projects.model)
     api(projects.scanner)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestApi(testFixtures(projects.scanner))
 }
diff --git a/plugins/scanners/scancode/build.gradle.kts b/plugins/scanners/scancode/build.gradle.kts
@@ -37,7 +37,8 @@ dependencies {
     implementation(projects.utils.ortUtils)
     implementation(projects.utils.spdxUtils)
 
-    implementation(libs.bundles.kotlinxSerialization)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
 
     funTestApi(testFixtures(projects.scanner))
 

diff --git a/plugins/scanners/scanoss/build.gradle.kts b/plugins/scanners/scanoss/build.gradle.kts
@@ -37,7 +37,8 @@ dependencies {
 
     funTestApi(testFixtures(projects.scanner))
 
-    testImplementation(libs.bundles.kotlinxSerialization)
+    testImplementation(libs.kotlinx.serialization.core)
+    testImplementation(libs.kotlinx.serialization.json)
     testImplementation(libs.mockk)
     testImplementation(libs.wiremock)
 }

diff --git a/scanner/build.gradle.kts b/scanner/build.gradle.kts
@@ -47,7 +47,8 @@ dependencies {
 
     testImplementation(platform(projects.plugins.scanners))
 
-    testImplementation(libs.bundles.kotlinxSerialization)
+    testImplementation(libs.kotlinx.serialization.core)
+    testImplementation(libs.kotlinx.serialization.json)
     testImplementation(libs.mockk)
     testImplementation(libs.retrofit.converter.kotlinxSerialization)
     testImplementation(libs.wiremock)