You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/09/21 03:33:13 UTC
[groovy] 01/05: Migrate buildSrc to composite build
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit f4a0aada5e12514f6d82ba6096980f578143017e
Author: Goooler <wa...@gmail.com>
AuthorDate: Sat Sep 3 11:27:23 2022 +0800
Migrate buildSrc to composite build
---
{buildSrc => build-logic}/build.gradle | 0
{buildSrc => build-logic}/src/main/groovy/Services.groovy | 0
.../src/main/groovy/org.apache.groovy-aggregating-project.gradle | 0
{buildSrc => build-logic}/src/main/groovy/org.apache.groovy-all.gradle | 0
.../src/main/groovy/org.apache.groovy-artifactory.gradle | 0
.../src/main/groovy/org.apache.groovy-asciidoctor.gradle | 0
.../src/main/groovy/org.apache.groovy-bad-practices-detection.gradle | 0
{buildSrc => build-logic}/src/main/groovy/org.apache.groovy-base.gradle | 0
.../src/main/groovy/org.apache.groovy-common.gradle | 0
{buildSrc => build-logic}/src/main/groovy/org.apache.groovy-core.gradle | 0
.../src/main/groovy/org.apache.groovy-distribution.gradle | 0
.../src/main/groovy/org.apache.groovy-doc-aggregator.gradle | 0
.../src/main/groovy/org.apache.groovy-documented.gradle | 0
.../src/main/groovy/org.apache.groovy-internal.gradle | 0
.../src/main/groovy/org.apache.groovy-jacoco-aggregation.gradle | 0
.../src/main/groovy/org.apache.groovy-library.gradle | 0
.../src/main/groovy/org.apache.groovy-performance.gradle | 0
.../src/main/groovy/org.apache.groovy-platform.gradle | 0
.../src/main/groovy/org.apache.groovy-publish-validation.gradle | 0
.../src/main/groovy/org.apache.groovy-published-library.gradle | 0
.../src/main/groovy/org.apache.groovy-stresstest.gradle | 0
.../src/main/groovy/org.apache.groovy-tested.gradle | 0
.../main/groovy/org/apache/groovy/gradle/CheckstyleHtmlReport.groovy | 0
.../apache/groovy/gradle/ConcurrentExecutionControlBuildService.groovy | 0
.../src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy | 0
.../src/main/groovy/org/apache/groovy/gradle/DgmConverter.groovy | 0
.../main/groovy/org/apache/groovy/gradle/DistributionExtension.groovy | 0
.../main/groovy/org/apache/groovy/gradle/DocAggregationExtension.groovy | 0
.../src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy | 0
.../main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy | 0
.../src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy | 0
.../main/groovy/org/apache/groovy/gradle/PerformanceTestSummary.groovy | 0
.../groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy | 0
.../main/groovy/org/apache/groovy/gradle/ReleaseInfoGenerator.groovy | 0
.../src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy | 0
.../src/main/groovy/org/apache/groovy/gradle/Versions.groovy | 0
.../groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy | 0
settings.gradle | 2 ++
38 files changed, 2 insertions(+)
diff --git a/buildSrc/build.gradle b/build-logic/build.gradle
similarity index 100%
rename from buildSrc/build.gradle
rename to build-logic/build.gradle
diff --git a/buildSrc/src/main/groovy/Services.groovy b/build-logic/src/main/groovy/Services.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/Services.groovy
rename to build-logic/src/main/groovy/Services.groovy
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-aggregating-project.gradle b/build-logic/src/main/groovy/org.apache.groovy-aggregating-project.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-aggregating-project.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-aggregating-project.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-all.gradle b/build-logic/src/main/groovy/org.apache.groovy-all.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-all.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-all.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-artifactory.gradle b/build-logic/src/main/groovy/org.apache.groovy-artifactory.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-artifactory.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-artifactory.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle b/build-logic/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-base.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-base.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle b/build-logic/src/main/groovy/org.apache.groovy-common.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-common.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-common.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-core.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-core.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-distribution.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-documented.gradle b/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-documented.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-documented.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-internal.gradle b/build-logic/src/main/groovy/org.apache.groovy-internal.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-internal.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-internal.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-jacoco-aggregation.gradle b/build-logic/src/main/groovy/org.apache.groovy-jacoco-aggregation.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-jacoco-aggregation.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-jacoco-aggregation.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-library.gradle b/build-logic/src/main/groovy/org.apache.groovy-library.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-library.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-library.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-performance.gradle b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-performance.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-performance.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-platform.gradle b/build-logic/src/main/groovy/org.apache.groovy-platform.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-platform.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-platform.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-publish-validation.gradle b/build-logic/src/main/groovy/org.apache.groovy-publish-validation.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-publish-validation.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-publish-validation.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle b/build-logic/src/main/groovy/org.apache.groovy-published-library.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-published-library.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-published-library.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-stresstest.gradle b/build-logic/src/main/groovy/org.apache.groovy-stresstest.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-stresstest.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-stresstest.gradle
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-tested.gradle b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/org.apache.groovy-tested.gradle
rename to build-logic/src/main/groovy/org.apache.groovy-tested.gradle
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/CheckstyleHtmlReport.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/CheckstyleHtmlReport.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/CheckstyleHtmlReport.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/CheckstyleHtmlReport.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/ConcurrentExecutionControlBuildService.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/ConcurrentExecutionControlBuildService.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/ConcurrentExecutionControlBuildService.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/ConcurrentExecutionControlBuildService.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DgmConverter.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/DgmConverter.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/DgmConverter.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/DgmConverter.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DistributionExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/DistributionExtension.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/DistributionExtension.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/DistributionExtension.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocAggregationExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/DocAggregationExtension.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/DocAggregationExtension.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/DocAggregationExtension.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestSummary.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestSummary.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestSummary.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestSummary.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/ReleaseInfoGenerator.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/ReleaseInfoGenerator.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/ReleaseInfoGenerator.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/ReleaseInfoGenerator.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/SharedConfiguration.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/Versions.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/Versions.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/Versions.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/Versions.groovy
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
similarity index 100%
rename from buildSrc/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
rename to build-logic/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
diff --git a/settings.gradle b/settings.gradle
index ee3138ec15..d28757c6fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -24,6 +24,8 @@ pluginManagement {
mavenCentral()
// maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
}
+
+ includeBuild("build-logic")
}
// check https://gradle.com/enterprise/releases with new versions. GE plugin version should not lag behind Gradle version