Move DSL extensions and publishing plugins to separate projects

Author: marcphilipp

Diff for: build.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.dependencyProject
+
 plugins {
 	id("junitbuild.base-conventions")
 	id("junitbuild.build-metadata")

Diff for: documentation/documentation.gradle.kts

@@ -2,6 +2,9 @@ import junitbuild.exec.CaptureJavaExecOutput
 import junitbuild.exec.ClasspathSystemPropertyProvider
 import junitbuild.exec.GenerateStandaloneConsoleLauncherShadowedArtifactsFile
 import junitbuild.exec.RunConsoleLauncher
+import junitbuild.extensions.dependencyProject
+import junitbuild.extensions.isSnapshot
+import junitbuild.extensions.javaModuleName
 import junitbuild.javadoc.ModuleSpecificJavadocFileOption
 import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask

Diff for: gradle/base/code-generator-model/build.gradle.kts

@@ -1,9 +1,3 @@
 plugins {
     `kotlin-dsl`
 }
-
-group = "junitbuild.base"
-
-repositories {
-    gradlePluginPortal()
-}

Diff for: gradle/base/dsl-extensions/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    `kotlin-dsl`
+}

Diff for: gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/DependencyExtensions.kt

@@ -0,0 +1,8 @@
+package junitbuild.extensions
+
+import org.gradle.api.provider.Provider
+import org.gradle.plugin.use.PluginDependency
+
+// see https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_markers
+val Provider<PluginDependency>.markerCoordinates: Provider<String>
+    get() = map { "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" }

Diff for: gradle/plugins/common/src/main/kotlin/ProjectExtensions.kt renamed to gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/ProjectExtensions.kt

@@ -1,3 +1,5 @@
+package junitbuild.extensions
+
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.VersionCatalog

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild/extensions/Extensions.kt renamed to gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/StringExtensions.kt

@@ -1,3 +1,5 @@
+package junitbuild.extensions
+
 import org.gradle.api.Task
 import org.gradle.internal.os.OperatingSystem
 

Diff for: gradle/plugins/common/src/main/kotlin/TaskExtensions.kt renamed to gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/TaskExtensions.kt

@@ -1 +1,3 @@
+package junitbuild.extensions
+
 fun Any.isSnapshot(): Boolean = toString().contains("SNAPSHOT")

Diff for: gradle/plugins/common/src/main/kotlin/VersionExtensions.kt renamed to gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/VersionExtensions.kt

@@ -0,0 +1 @@
+// Just a dummy plugin to get the extensions on the classpath of downstream builds

Diff for: gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/junitbuild.dsl-extensions.gradle.kts

@@ -0,0 +1 @@
+group = junitbuild.base

Diff for: gradle/base/gradle.properties

@@ -1,3 +1,10 @@
 rootProject.name = "base"
 
+dependencyResolutionManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
 include("code-generator-model")
+include("dsl-extensions")

Diff for: gradle/base/settings.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
 	implementation("junitbuild.base:code-generator-model")
+	implementation("junitbuild.base:dsl-extensions")
 	implementation(projects.common)
 	implementation(libs.jackson.dataformat.yaml)
 	implementation(libs.jackson.module.kotlin)

Diff for: gradle/plugins/code-generator/build.gradle.kts

@@ -1,3 +1,4 @@
+import junitbuild.extensions.dependencyFromLibs
 import junitbuild.generator.GenerateJreRelatedSourceCode
 
 plugins {

Diff for: gradle/plugins/code-generator/src/main/kotlin/junitbuild.code-generator.gradle.kts

@@ -1,8 +1,11 @@
+import junitbuild.extensions.markerCoordinates
+
 plugins {
 	`kotlin-dsl`
 }
 
 dependencies {
+	implementation("junitbuild.base:dsl-extensions")
 	implementation(projects.buildParameters)
 	implementation(libs.plugins.kotlin.markerCoordinates)
 	implementation(libs.plugins.bnd.markerCoordinates)
@@ -15,7 +18,3 @@ dependencies {
 	implementation(libs.plugins.spotless.markerCoordinates)
 	implementation(libs.plugins.versions.markerCoordinates)
 }
-
-// see https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_markers
-val Provider<PluginDependency>.markerCoordinates: Provider<String>
-	get() = map { "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" }

Diff for: gradle/plugins/common/build.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.requiredVersionFromLibs
+
 plugins {
 	base
 	checkstyle

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-conventions.gradle.kts

@@ -1,3 +1,6 @@
+import junitbuild.extensions.dependencyFromLibs
+import junitbuild.extensions.requiredVersionFromLibs
+
 plugins {
 	id("junitbuild.checkstyle-conventions")
 }

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-nohttp.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.requiredVersionFromLibs
+
 plugins {
 	jacoco
 	id("junitbuild.build-parameters")

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts

@@ -1,4 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import junitbuild.extensions.javaModuleName
+import junitbuild.extensions.isSnapshot
 import junitbuild.java.ModuleCompileOptions
 import junitbuild.java.ModulePathArgumentProvider
 import junitbuild.java.PatchModuleArgumentProvider

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts

@@ -1,3 +1,6 @@
+import junitbuild.extensions.requiredVersionFromLibs
+import junitbuild.extensions.dependencyFromLibs
+
 plugins {
 	id("me.champeau.jmh")
 }

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.jmh-conventions.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.dependencyFromLibs
+
 plugins {
 	`java-library`
 }

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.isSnapshot
+
 plugins {
 	`maven-publish`
 	signing

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.requiredVersionFromLibs
+
 plugins {
 	id("com.diffplug.spotless")
 }

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts

@@ -1,6 +1,8 @@
-
 import com.gradle.develocity.agent.gradle.internal.test.PredictiveTestSelectionConfigurationInternal
 import com.gradle.develocity.agent.gradle.test.PredictiveTestSelectionMode
+import junitbuild.extensions.trackOperationSystemAsInput
+import junitbuild.extensions.dependencyFromLibs
+import junitbuild.extensions.bundleFromLibs
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts

@@ -20,7 +20,7 @@ import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
 import org.gradle.process.CommandLineArgumentProvider
 import org.gradle.process.ExecOperations
-import trackOperationSystemAsInput
+import junitbuild.extensions.trackOperationSystemAsInput
 import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt

@@ -1,6 +1,6 @@
 package junitbuild.java
 
-import javaModuleName
+import junitbuild.extensions.javaModuleName
 import org.gradle.api.Named
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt

@@ -0,0 +1,10 @@
+import junitbuild.extensions.markerCoordinates
+
+plugins {
+	`kotlin-dsl`
+}
+
+dependencies {
+	implementation("junitbuild.base:dsl-extensions")
+	implementation(libs.plugins.jreleaser.markerCoordinates)
+}

Diff for: gradle/plugins/publishing/build.gradle.kts

@@ -1,4 +1,3 @@
-
 import org.jreleaser.model.Active.RELEASE
 import org.jreleaser.model.api.deploy.maven.MavenCentralMavenDeployer.Stage
 import java.util.Properties

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.maven-central-publishing.gradle.kts renamed to gradle/plugins/publishing/src/main/kotlin/junitbuild.maven-central-publishing.gradle.kts

@@ -13,7 +13,7 @@ import java.io.File
 import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
-import java.net.http.HttpResponse.BodyHandlers
+import java.net.http.HttpResponse
 
 abstract class VerifyBinaryArtifactsAreIdentical : DefaultTask() {
 
@@ -52,7 +52,7 @@ abstract class VerifyBinaryArtifactsAreIdentical : DefaultTask() {
                     val url = URI.create("${baseUrl}/${relativeFile.path}")
                     logger.info("Checking {}...", url)
                     val request = HttpRequest.newBuilder().GET().uri(url).build()
-                    val response = httpClient.send(request, BodyHandlers.ofString())
+                    val response = httpClient.send(request, HttpResponse.BodyHandlers.ofString())
                     val remoteSha512 = if (response.statusCode() == 200) response.body() else "status=${response.statusCode()}"
                     if (localSha512 != remoteSha512) {
                         mismatches.add(Mismatch(relativeFile, localSha512, remoteSha512))

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts renamed to gradle/plugins/publishing/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts

@@ -1,3 +1,11 @@
+pluginManagement {
+	includeBuild("../base")
+}
+
+plugins {
+	id("junitbuild.dsl-extensions") apply false
+}
+
 dependencyResolutionManagement {
 	versionCatalogs {
 		create("libs") {
@@ -11,10 +19,9 @@ dependencyResolutionManagement {
 
 rootProject.name = "plugins"
 
-includeBuild("../base")
-
 include("build-parameters")
 include("common")
 include("code-generator")
+include("publishing")
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

Diff for: gradle/plugins/common/src/main/kotlin/junitbuild/release/VerifyBinaryArtifactsAreIdentical.kt renamed to gradle/plugins/publishing/src/main/kotlin/junitbuild/release/VerifyBinaryArtifactsAreIdentical.kt

@@ -1,3 +1,5 @@
+import junitbuild.extensions.javaModuleName
+
 plugins {
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.shadow-conventions")

Diff for: gradle/plugins/settings.gradle.kts

@@ -1,3 +1,4 @@
+import junitbuild.extensions.dependencyProject
 import junitbuild.java.WriteArtifactsFile
 
 plugins {

Diff for: junit-jupiter-params/junit-jupiter-params.gradle.kts

@@ -1,3 +1,4 @@
+import junitbuild.extensions.javaModuleName
 import junitbuild.java.UpdateJarAction
 
 plugins {

Diff for: junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts

@@ -1,3 +1,5 @@
+import junitbuild.extensions.javaModuleName
+
 plugins {
 	id("junitbuild.java-library-conventions")
 	id("junitbuild.native-image-properties")

Diff for: junit-platform-console/junit-platform-console.gradle.kts

@@ -1,5 +1,5 @@
-
 import junitbuild.extensions.capitalized
+import junitbuild.extensions.dependencyProject
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.internal.os.OperatingSystem
 

Diff for: junit-platform-reporting/junit-platform-reporting.gradle.kts

@@ -1,6 +1,6 @@
-
 import com.gradle.develocity.agent.gradle.internal.test.TestDistributionConfigurationInternal
 import junitbuild.extensions.capitalized
+import junitbuild.extensions.dependencyProject
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.kotlin.dsl.support.listFilesOrdered
 import java.time.Duration