Clean up dependencies in conventions plugins

Author: serpro69

buildSrc/src/main/kotlin/faker-ext-conventions.gradle.kts

@@ -1,18 +1,23 @@
-/**
- * Plugin for :extension:* modules
- */
-
-plugins {
-    id("faker-jvm-conventions")
-    id("faker-pub-conventions")
-}
+/** Plugin for :extension:* modules */
+plugins { id("faker-lib-conventions") }
 
 kotlin {
     sourceSets {
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
-                implementation(libs.bundles.kotlin)
+                compileOnly(project(":kotlin-faker"))
+            }
+        }
+        jvmTest {
+            dependencies {
+                // needed for tests since we have compileOnly dependency
+                implementation(project(":kotlin-faker"))
             }
         }
     }
 }
+
+tasks.named<Test>("jvmTest") {
+    // TODO: is this needed?
+    dependsOn(":kotlin-faker:jvmJar")
+}

buildSrc/src/main/kotlin/faker-jvm-conventions.gradle.kts

@@ -30,8 +30,6 @@ kotlin {
             }
         tasks.check { dependsOn(maxJdk.executionTask) }
     }
-
-    sourceSets { jvmTest { dependencies { implementation(libs.bundles.test.kotest) } } }
 }
 
 val versionCatalog: VersionCatalog = versionCatalogs.named("libs")

buildSrc/src/main/kotlin/faker-kotlin-conventions.gradle.kts

@@ -14,13 +14,21 @@ plugins {
 }
 
 kotlin {
-    sourceSets.configureEach {
-        withSourcesJar()
+    sourceSets {
+        configureEach {
+            withSourcesJar()
 
-        resources.srcDir("build/generated/src/jvmMain/resources")
-        dependencies {
-            implementation(platform(libs.kotlin.bom.get()))
-            implementation(libs.bundles.kotlin)
+            resources.srcDir("build/generated/src/jvmMain/resources")
+            dependencies {
+                implementation(platform(libs.kotlin.bom.get()))
+                implementation(libs.bundles.kotlin)
+            }
+        }
+
+        jvmTest {
+            dependencies {
+                implementation(libs.bundles.test.kotest)
+            }
         }
     }
 }

buildSrc/src/main/kotlin/faker-lib-conventions.gradle.kts

@@ -1,13 +1,12 @@
 /** Plugin for "faker libraries" */
 plugins {
-    id("org.jetbrains.dokka")
     id("faker-jvm-conventions")
     id("faker-pub-conventions")
 }
 
 kotlin {
     sourceSets {
-        val jvmTest by getting {
+        jvmTest {
             dependencies {
                 runtimeOnly("ch.qos.logback:logback-core:1.3.4") {
                     version { strictly("1.3.4") /* last stable for java 8 */ }

extension/blns/build.gradle.kts

@@ -1,24 +1,3 @@
 plugins { `faker-ext-conventions` }
 
-kotlin {
-    sourceSets {
-        val jvmMain by getting {
-            dependencies {
-                compileOnly(projects.kotlinFaker)
-                implementation(libs.bundles.jackson)
-            }
-        }
-        val jvmTest by getting {
-            dependencies {
-                // needed for tests since we have compileOnly dependency
-                implementation(projects.kotlinFaker)
-                implementation(libs.bundles.test.kotest)
-            }
-        }
-    }
-}
-
-tasks.jvmTest {
-    useJUnitPlatform()
-    dependsOn(":kotlin-faker:jvmJar")
-}
+kotlin { sourceSets { jvmMain { dependencies { implementation(libs.bundles.jackson) } } } }

extension/kotest-property/build.gradle.kts

@@ -1,23 +1,3 @@
 plugins { `faker-ext-conventions` }
 
-kotlin {
-    sourceSets {
-        val jvmMain by getting {
-            dependencies {
-                compileOnly(projects.kotlinFaker)
-                compileOnly(libs.test.kotest.property)
-            }
-        }
-        val jvmTest by getting {
-            dependencies {
-                implementation(projects.kotlinFaker)
-                implementation(libs.bundles.test.kotest)
-            }
-        }
-    }
-}
-
-tasks.jvmTest {
-    useJUnitPlatform()
-    dependsOn(":kotlin-faker:jvmJar")
-}
+kotlin { sourceSets { jvmMain { dependencies { compileOnly(libs.test.kotest.property) } } } }