Replace buildSrc with an included build (junit-team#3151)

- moved `buildSrc` to `gradle/plugins` - added `junitbuild` as group to all plugins - moved build logic classes from `org.junit.gradle` package to `junitbuild` package Resolves junit-team#3149.
023-dev · Feb 16, 2023 · 4b1de7d · 4b1de7d
1 parent cae2bff
commit 4b1de7d
Show file tree

Hide file tree

Showing 59 changed files with 83 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 # Gradle
 .gradle
-/build/
-/*/build/
+build
 
 # Ignore Gradle GUI config
 gradle-app.setting

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
-	`base-conventions`
-	`build-metadata`
-	`dependency-update-check`
-	`jacoco-aggregation-conventions`
-	`temp-maven-repo`
+	id("junitbuild.base-conventions")
+	id("junitbuild.build-metadata")
+	id("junitbuild.dependency-update-check")
+	id("junitbuild.jacoco-aggregation-conventions")
+	id("junitbuild.temp-maven-repo")
 }
 
 description = "JUnit 5"
@@ -61,5 +61,5 @@ nexusPublishing {
 }
 
 nohttp {
-	source.exclude("buildSrc/build/generated-sources/**")
+	source.exclude("**/.gradle/**", "gradle/plugins/build/generated-sources/**")
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
diff --git a/buildSrc/src/main/kotlin/base-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
@@ -2,17 +2,17 @@ import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.junit.gradle.exec.ClasspathSystemPropertyProvider
-import org.junit.gradle.exec.RunConsoleLauncher
-import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
+import junitbuild.exec.ClasspathSystemPropertyProvider
+import junitbuild.exec.RunConsoleLauncher
+import junitbuild.javadoc.ModuleSpecificJavadocFileOption
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 
 plugins {
 	id("org.asciidoctor.jvm.convert")
 	id("org.asciidoctor.jvm.pdf")
 	id("org.ajoberstar.git-publish")
-	`kotlin-library-conventions`
+	id("junitbuild.kotlin-library-conventions")
 }
 
 val modularProjects: List<Project> by rootProject

diff --git a/buildSrc/build.gradle.kts → gradle/plugins/build.gradle.kts b/buildSrc/build.gradle.kts → gradle/plugins/build.gradle.kts
@@ -20,11 +20,11 @@ dependencies {
 
 tasks {
 	withType<JavaCompile>().configureEach {
-		options.release.set(8)
+		options.release.set(11)
 	}
 	withType<KotlinCompile>().configureEach {
 		kotlinOptions {
-			jvmTarget = "1.8"
+			jvmTarget = "11"
 			allWarningsAsErrors = true
 		}
 	}

diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
diff --git a/...c/src/main/kotlin/JavaLibraryExtension.kt → ...s/src/main/kotlin/JavaLibraryExtension.kt b/...c/src/main/kotlin/JavaLibraryExtension.kt → ...s/src/main/kotlin/JavaLibraryExtension.kt
diff --git a/buildSrc/src/main/kotlin/License.kt → gradle/plugins/src/main/kotlin/License.kt b/buildSrc/src/main/kotlin/License.kt → gradle/plugins/src/main/kotlin/License.kt
diff --git a/...dSrc/src/main/kotlin/ProjectExtensions.kt → ...gins/src/main/kotlin/ProjectExtensions.kt b/...dSrc/src/main/kotlin/ProjectExtensions.kt → ...gins/src/main/kotlin/ProjectExtensions.kt
diff --git a/buildSrc/src/main/kotlin/TaskExtensions.kt → ...plugins/src/main/kotlin/TaskExtensions.kt b/buildSrc/src/main/kotlin/TaskExtensions.kt → ...plugins/src/main/kotlin/TaskExtensions.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+	eclipse
+	idea
+	id("junitbuild.java-toolchain-conventions")
+	id("junitbuild.spotless-conventions")
+}
diff --git a/...src/main/kotlin/build-metadata.gradle.kts → ...tlin/junitbuild.build-metadata.gradle.kts b/...src/main/kotlin/build-metadata.gradle.kts → ...tlin/junitbuild.build-metadata.gradle.kts
diff --git a/...kotlin/dependency-update-check.gradle.kts → ...tbuild.dependency-update-check.gradle.kts b/...kotlin/dependency-update-check.gradle.kts → ...tbuild.dependency-update-check.gradle.kts
diff --git a/...jacoco-aggregation-conventions.gradle.kts → ...jacoco-aggregation-conventions.gradle.kts b/...jacoco-aggregation-conventions.gradle.kts → ...jacoco-aggregation-conventions.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.kotlin.dsl.`jacoco-report-aggregation`
 import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
 
 plugins {
-	id("jacoco-conventions")
+	id("junitbuild.jacoco-conventions")
 	`jacoco-report-aggregation`
 }
 

diff --git a/...main/kotlin/jacoco-conventions.gradle.kts → .../junitbuild.jacoco-conventions.gradle.kts b/...main/kotlin/jacoco-conventions.gradle.kts → .../junitbuild.jacoco-conventions.gradle.kts
diff --git a/...kotlin/jacoco-java-conventions.gradle.kts → ...tbuild.jacoco-java-conventions.gradle.kts b/...kotlin/jacoco-java-conventions.gradle.kts → ...tbuild.jacoco-java-conventions.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
 
 plugins {
 	java
-	id("jacoco-conventions")
+	id("junitbuild.jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

diff --git a/...otlin/java-library-conventions.gradle.kts → ...build.java-library-conventions.gradle.kts b/...otlin/java-library-conventions.gradle.kts → ...build.java-library-conventions.gradle.kts
@@ -1,14 +1,14 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.junit.gradle.java.ModulePathArgumentProvider
-import org.junit.gradle.java.PatchModuleArgumentProvider
+import junitbuild.java.ModulePathArgumentProvider
+import junitbuild.java.PatchModuleArgumentProvider
 
 plugins {
 	`java-library`
 	eclipse
 	idea
 	checkstyle
-	id("base-conventions")
-	id("jacoco-java-conventions")
+	id("junitbuild.base-conventions")
+	id("junitbuild.jacoco-java-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
@@ -42,8 +42,8 @@ java {
 
 if (project in mavenizedProjects) {
 
-	apply(plugin = "publishing-conventions")
-	apply(plugin = "osgi-conventions")
+	apply(plugin = "junitbuild.publishing-conventions")
+	apply(plugin = "junitbuild.osgi-conventions")
 
 	java {
 		withJavadocJar()

diff --git a/...lin/java-multi-release-sources.gradle.kts → ...ild.java-multi-release-sources.gradle.kts b/...lin/java-multi-release-sources.gradle.kts → ...ild.java-multi-release-sources.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

diff --git a/...ain/kotlin/java-repackage-jars.gradle.kts → ...junitbuild.java-repackage-jars.gradle.kts b/...ain/kotlin/java-repackage-jars.gradle.kts → ...junitbuild.java-repackage-jars.gradle.kts
diff --git a/...lin/java-toolchain-conventions.gradle.kts → ...ild.java-toolchain-conventions.gradle.kts b/...lin/java-toolchain-conventions.gradle.kts → ...ild.java-toolchain-conventions.gradle.kts
diff --git a/...in/kotlin/junit4-compatibility.gradle.kts → ...unitbuild.junit4-compatibility.gradle.kts b/...in/kotlin/junit4-compatibility.gradle.kts → ...unitbuild.junit4-compatibility.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 			strictly("4.12")
 		}
 	}
-	pluginManager.withPlugin("osgi-conventions") {
+	pluginManager.withPlugin("junitbuild.osgi-conventions") {
 		val junit4Osgi = requiredVersionFromLibs("junit4Osgi")
 		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${junit4Osgi}")
 	}

diff --git a/...lin/kotlin-library-conventions.gradle.kts → ...ild.kotlin-library-conventions.gradle.kts b/...lin/kotlin-library-conventions.gradle.kts → ...ild.kotlin-library-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 	kotlin("jvm")
 }
 

diff --git a/...c/main/kotlin/osgi-conventions.gradle.kts → ...in/junitbuild.osgi-conventions.gradle.kts b/...c/main/kotlin/osgi-conventions.gradle.kts → ...in/junitbuild.osgi-conventions.gradle.kts
diff --git a/.../kotlin/publishing-conventions.gradle.kts → ...itbuild.publishing-conventions.gradle.kts b/.../kotlin/publishing-conventions.gradle.kts → ...itbuild.publishing-conventions.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 	`maven-publish`
 	signing
-	id("base-conventions")
+	id("junitbuild.base-conventions")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")

diff --git a/...main/kotlin/shadow-conventions.gradle.kts → .../junitbuild.shadow-conventions.gradle.kts b/...main/kotlin/shadow-conventions.gradle.kts → .../junitbuild.shadow-conventions.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 	id("com.github.johnrengelman.shadow")
 }
 

diff --git a/...in/kotlin/spotless-conventions.gradle.kts → ...unitbuild.spotless-conventions.gradle.kts b/...in/kotlin/spotless-conventions.gradle.kts → ...unitbuild.spotless-conventions.gradle.kts
diff --git a/...rc/main/kotlin/temp-maven-repo.gradle.kts → ...lin/junitbuild.temp-maven-repo.gradle.kts b/...rc/main/kotlin/temp-maven-repo.gradle.kts → ...lin/junitbuild.temp-maven-repo.gradle.kts
diff --git a/...ain/kotlin/testing-conventions.gradle.kts → ...junitbuild.testing-conventions.gradle.kts b/...ain/kotlin/testing-conventions.gradle.kts → ...junitbuild.testing-conventions.gradle.kts
diff --git a/...e/exec/ClasspathSystemPropertyProvider.kt → ...d/exec/ClasspathSystemPropertyProvider.kt b/...e/exec/ClasspathSystemPropertyProvider.kt → ...d/exec/ClasspathSystemPropertyProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.exec
+package junitbuild.exec
 
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.Classpath

diff --git a/...g/junit/gradle/exec/RunConsoleLauncher.kt → ...lin/junitbuild/exec/RunConsoleLauncher.kt b/...g/junit/gradle/exec/RunConsoleLauncher.kt → ...lin/junitbuild/exec/RunConsoleLauncher.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.exec
+package junitbuild.exec
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection

diff --git a/...in/org/junit/gradle/java/ExecJarAction.kt → ...n/kotlin/junitbuild/java/ExecJarAction.kt b/...in/org/junit/gradle/java/ExecJarAction.kt → ...n/kotlin/junitbuild/java/ExecJarAction.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.Action
 import org.gradle.api.Task

diff --git a/...gradle/java/ModulePathArgumentProvider.kt → ...tbuild/java/ModulePathArgumentProvider.kt b/...gradle/java/ModulePathArgumentProvider.kt → ...tbuild/java/ModulePathArgumentProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.Named
 import org.gradle.api.Project

diff --git a/...radle/java/PatchModuleArgumentProvider.kt → ...build/java/PatchModuleArgumentProvider.kt b/...radle/java/PatchModuleArgumentProvider.kt → ...build/java/PatchModuleArgumentProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import javaModuleName
 import org.gradle.api.Named

diff --git a/...g/junit/gradle/java/WriteArtifactsFile.kt → ...lin/junitbuild/java/WriteArtifactsFile.kt b/...g/junit/gradle/java/WriteArtifactsFile.kt → ...lin/junitbuild/java/WriteArtifactsFile.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration

diff --git a/...avadoc/ModuleSpecificJavadocFileOption.kt → ...avadoc/ModuleSpecificJavadocFileOption.kt b/...avadoc/ModuleSpecificJavadocFileOption.kt → ...avadoc/ModuleSpecificJavadocFileOption.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.javadoc
+package junitbuild.javadoc
 
 import org.gradle.external.javadoc.JavadocOptionFileOption
 import org.gradle.external.javadoc.internal.JavadocOptionFileWriterContext

diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
 	`java-platform`
-	`publishing-conventions`
+	id("junitbuild.publishing-conventions")
 }
 
 description = "${rootProject.description} (Bill of Materials)"

diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`kotlin-library-conventions`
+	id("junitbuild.kotlin-library-conventions")
 	`java-test-fixtures`
 }
 

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -1,8 +1,8 @@
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
-	`kotlin-library-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.testing-conventions")
 	groovy
 	`java-test-fixtures`
 }

diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Migration Support"

diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`kotlin-library-conventions`
-	`shadow-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.shadow-conventions")
+	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Params"

diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Jupiter (Aggregator)"

diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -1,9 +1,9 @@
-import org.junit.gradle.java.ExecJarAction
+import junitbuild.java.ExecJarAction
 
 plugins {
-	`java-library-conventions`
-	`java-multi-release-sources`
-	`java-repackage-jars`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.java-multi-release-sources")
+	id("junitbuild.java-repackage-jars")
 	`java-test-fixtures`
 }
 

diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -1,8 +1,8 @@
-import org.junit.gradle.java.WriteArtifactsFile
+import junitbuild.java.WriteArtifactsFile
 
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
 }
 
 description = "JUnit Platform Console Standalone"

diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
-	`java-multi-release-sources`
-	`java-repackage-jars`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
+	id("junitbuild.java-multi-release-sources")
+	id("junitbuild.java-repackage-jars")
 }
 
 description = "JUnit Platform Console"
@@ -38,7 +38,7 @@ tasks {
 			into("META-INF")
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
-		doLast(objects.newInstance(org.junit.gradle.java.ExecJarAction::class).apply {
+		doLast(objects.newInstance(junitbuild.java.ExecJarAction::class).apply {
 			javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
 			args.addAll(
 				"--update",

diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 	`java-test-fixtures`
 }
 

diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Flight Recorder Support"

diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 	`java-test-fixtures`
 }
 

diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
 }
 
 description = "JUnit Platform Reporting"

diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
 }
 
 description = "JUnit Platform Runner"

diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite API"

diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite Commons"

diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite Engine"

diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite (Aggregator)"

diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Test Kit"