From 681c85ce2a1634be872abc244bade510bbe5670b Mon Sep 17 00:00:00 2001 From: Erik Helin Date: Wed, 10 Feb 2021 11:10:28 +0100 Subject: [PATCH] build: use included build instead of buildSrc --- bots/cli/build.gradle | 2 +- build.gradle | 21 +++++++++++---- buildSrc/settings.gradle | 27 ------------------- cli/build.gradle | 2 +- {buildSrc => gradle/plugins}/.gitignore | 0 {buildSrc => gradle/plugins}/build.gradle | 0 .../plugins/images-plugin}/build.gradle | 4 ++- gradle/plugins/images-plugin/settings.gradle | 1 + .../skara/gradle/images/DownloadJDKTask.java | 0 .../skara/gradle/images/ImageEnvironment.java | 0 .../skara/gradle/images/ImagesPlugin.java | 0 .../skara/gradle/images/LaunchersTask.java | 0 .../openjdk/skara/gradle/images/LinkTask.java | 0 .../plugins/module-plugin}/build.gradle | 4 ++- gradle/plugins/module-plugin/settings.gradle | 1 + .../skara/gradle/module/ModuleExtension.java | 0 .../skara/gradle/module/ModulePlugin.java | 0 .../plugins/proxy-plugin}/build.gradle | 4 ++- gradle/plugins/proxy-plugin/settings.gradle | 1 + .../skara/gradle/proxy/ProxyPlugin.java | 0 .../plugins/reproduce-plugin}/build.gradle | 4 ++- .../plugins/reproduce-plugin/settings.gradle | 1 + .../gradle/reproduce/ReproducePlugin.java | 0 .../skara/gradle/reproduce/ReproduceTask.java | 0 .../plugins/version-plugin}/build.gradle | 4 ++- gradle/plugins/version-plugin/settings.gradle | 1 + .../skara/gradle/version/VersionPlugin.java | 0 settings.gradle | 6 +++++ 28 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 buildSrc/settings.gradle rename {buildSrc => gradle/plugins}/.gitignore (100%) rename {buildSrc => gradle/plugins}/build.gradle (100%) rename {buildSrc/images => gradle/plugins/images-plugin}/build.gradle (95%) create mode 100644 gradle/plugins/images-plugin/settings.gradle rename {buildSrc/images => gradle/plugins/images-plugin}/src/main/java/org/openjdk/skara/gradle/images/DownloadJDKTask.java (100%) rename {buildSrc/images => gradle/plugins/images-plugin}/src/main/java/org/openjdk/skara/gradle/images/ImageEnvironment.java (100%) rename {buildSrc/images => gradle/plugins/images-plugin}/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java (100%) rename {buildSrc/images => gradle/plugins/images-plugin}/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java (100%) rename {buildSrc/images => gradle/plugins/images-plugin}/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java (100%) rename {buildSrc/module => gradle/plugins/module-plugin}/build.gradle (95%) create mode 100644 gradle/plugins/module-plugin/settings.gradle rename {buildSrc/module => gradle/plugins/module-plugin}/src/main/java/org/openjdk/skara/gradle/module/ModuleExtension.java (100%) rename {buildSrc/module => gradle/plugins/module-plugin}/src/main/java/org/openjdk/skara/gradle/module/ModulePlugin.java (100%) rename {buildSrc/proxy => gradle/plugins/proxy-plugin}/build.gradle (95%) create mode 100644 gradle/plugins/proxy-plugin/settings.gradle rename {buildSrc/proxy => gradle/plugins/proxy-plugin}/src/main/java/org/openjdk/skara/gradle/proxy/ProxyPlugin.java (100%) rename {buildSrc/reproduce => gradle/plugins/reproduce-plugin}/build.gradle (95%) create mode 100644 gradle/plugins/reproduce-plugin/settings.gradle rename {buildSrc/reproduce => gradle/plugins/reproduce-plugin}/src/main/java/org/openjdk/skara/gradle/reproduce/ReproducePlugin.java (100%) rename {buildSrc/reproduce => gradle/plugins/reproduce-plugin}/src/main/java/org/openjdk/skara/gradle/reproduce/ReproduceTask.java (100%) rename {buildSrc/version => gradle/plugins/version-plugin}/build.gradle (95%) create mode 100644 gradle/plugins/version-plugin/settings.gradle rename {buildSrc/version => gradle/plugins/version-plugin}/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java (100%) diff --git a/bots/cli/build.gradle b/bots/cli/build.gradle index 0a540af8d..43122b2ff 100644 --- a/bots/cli/build.gradle +++ b/bots/cli/build.gradle @@ -22,7 +22,7 @@ */ plugins { - id 'org.openjdk.skara.gradle.images' + id 'images' } module { diff --git a/build.gradle b/build.gradle index 9296602ac..74aad11f4 100644 --- a/build.gradle +++ b/build.gradle @@ -21,17 +21,28 @@ * questions. */ +buildscript { + dependencies { + classpath 'org.openjdk.skara.gradle:reproduce' + classpath 'org.openjdk.skara.gradle:proxy' + classpath 'org.openjdk.skara.gradle:version' + classpath 'org.openjdk.skara.gradle:images' + classpath 'org.openjdk.skara.gradle:module' + } +} + plugins { - id 'org.openjdk.skara.gradle.proxy' - id 'org.openjdk.skara.gradle.version' - id 'org.openjdk.skara.gradle.reproduce' + id 'proxy' + id 'version' + id 'reproduce' + id 'images' } configure(subprojects.findAll() { it.name != 'bots' }) { apply plugin: 'java-library' apply plugin: 'maven-publish' - apply plugin: 'org.openjdk.skara.gradle.module' - apply plugin: 'org.openjdk.skara.gradle.version' + apply plugin: 'module' + apply plugin: 'version' group = 'org.openjdk.skara' diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle deleted file mode 100644 index 9c2763813..000000000 --- a/buildSrc/settings.gradle +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -include 'images' -include 'module' -include 'proxy' -include 'reproduce' -include 'version' diff --git a/cli/build.gradle b/cli/build.gradle index c8ff4baac..beb9379fd 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -22,7 +22,7 @@ */ plugins { - id 'org.openjdk.skara.gradle.images' + id 'images' } module { diff --git a/buildSrc/.gitignore b/gradle/plugins/.gitignore similarity index 100% rename from buildSrc/.gitignore rename to gradle/plugins/.gitignore diff --git a/buildSrc/build.gradle b/gradle/plugins/build.gradle similarity index 100% rename from buildSrc/build.gradle rename to gradle/plugins/build.gradle diff --git a/buildSrc/images/build.gradle b/gradle/plugins/images-plugin/build.gradle similarity index 95% rename from buildSrc/images/build.gradle rename to gradle/plugins/images-plugin/build.gradle index a907e2ceb..6f31f23d1 100644 --- a/buildSrc/images/build.gradle +++ b/gradle/plugins/images-plugin/build.gradle @@ -25,10 +25,12 @@ plugins { id 'java-gradle-plugin' } +group = 'org.openjdk.skara.gradle' + gradlePlugin { plugins { simplePlugin { - id = 'org.openjdk.skara.gradle.images' + id = 'images' implementationClass = 'org.openjdk.skara.gradle.images.ImagesPlugin' } } diff --git a/gradle/plugins/images-plugin/settings.gradle b/gradle/plugins/images-plugin/settings.gradle new file mode 100644 index 000000000..b0bcb7afa --- /dev/null +++ b/gradle/plugins/images-plugin/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'images' diff --git a/buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/DownloadJDKTask.java b/gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/DownloadJDKTask.java similarity index 100% rename from buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/DownloadJDKTask.java rename to gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/DownloadJDKTask.java diff --git a/buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/ImageEnvironment.java b/gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/ImageEnvironment.java similarity index 100% rename from buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/ImageEnvironment.java rename to gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/ImageEnvironment.java diff --git a/buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java b/gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java similarity index 100% rename from buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java rename to gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java diff --git a/buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java b/gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java similarity index 100% rename from buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java rename to gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java diff --git a/buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java b/gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java similarity index 100% rename from buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java rename to gradle/plugins/images-plugin/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java diff --git a/buildSrc/module/build.gradle b/gradle/plugins/module-plugin/build.gradle similarity index 95% rename from buildSrc/module/build.gradle rename to gradle/plugins/module-plugin/build.gradle index 1045b2163..139936aa5 100644 --- a/buildSrc/module/build.gradle +++ b/gradle/plugins/module-plugin/build.gradle @@ -25,10 +25,12 @@ plugins { id 'java-gradle-plugin' } +group = 'org.openjdk.skara.gradle' + gradlePlugin { plugins { simplePlugin { - id = 'org.openjdk.skara.gradle.module' + id = 'module' implementationClass = 'org.openjdk.skara.gradle.module.ModulePlugin' } } diff --git a/gradle/plugins/module-plugin/settings.gradle b/gradle/plugins/module-plugin/settings.gradle new file mode 100644 index 000000000..790e3e431 --- /dev/null +++ b/gradle/plugins/module-plugin/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'module' diff --git a/buildSrc/module/src/main/java/org/openjdk/skara/gradle/module/ModuleExtension.java b/gradle/plugins/module-plugin/src/main/java/org/openjdk/skara/gradle/module/ModuleExtension.java similarity index 100% rename from buildSrc/module/src/main/java/org/openjdk/skara/gradle/module/ModuleExtension.java rename to gradle/plugins/module-plugin/src/main/java/org/openjdk/skara/gradle/module/ModuleExtension.java diff --git a/buildSrc/module/src/main/java/org/openjdk/skara/gradle/module/ModulePlugin.java b/gradle/plugins/module-plugin/src/main/java/org/openjdk/skara/gradle/module/ModulePlugin.java similarity index 100% rename from buildSrc/module/src/main/java/org/openjdk/skara/gradle/module/ModulePlugin.java rename to gradle/plugins/module-plugin/src/main/java/org/openjdk/skara/gradle/module/ModulePlugin.java diff --git a/buildSrc/proxy/build.gradle b/gradle/plugins/proxy-plugin/build.gradle similarity index 95% rename from buildSrc/proxy/build.gradle rename to gradle/plugins/proxy-plugin/build.gradle index 8d6a123c3..231c3e72e 100644 --- a/buildSrc/proxy/build.gradle +++ b/gradle/plugins/proxy-plugin/build.gradle @@ -25,10 +25,12 @@ plugins { id 'java-gradle-plugin' } +group = 'org.openjdk.skara.gradle' + gradlePlugin { plugins { simplePlugin { - id = 'org.openjdk.skara.gradle.proxy' + id = 'proxy' implementationClass = 'org.openjdk.skara.gradle.proxy.ProxyPlugin' } } diff --git a/gradle/plugins/proxy-plugin/settings.gradle b/gradle/plugins/proxy-plugin/settings.gradle new file mode 100644 index 000000000..fde0391fb --- /dev/null +++ b/gradle/plugins/proxy-plugin/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'proxy' diff --git a/buildSrc/proxy/src/main/java/org/openjdk/skara/gradle/proxy/ProxyPlugin.java b/gradle/plugins/proxy-plugin/src/main/java/org/openjdk/skara/gradle/proxy/ProxyPlugin.java similarity index 100% rename from buildSrc/proxy/src/main/java/org/openjdk/skara/gradle/proxy/ProxyPlugin.java rename to gradle/plugins/proxy-plugin/src/main/java/org/openjdk/skara/gradle/proxy/ProxyPlugin.java diff --git a/buildSrc/reproduce/build.gradle b/gradle/plugins/reproduce-plugin/build.gradle similarity index 95% rename from buildSrc/reproduce/build.gradle rename to gradle/plugins/reproduce-plugin/build.gradle index cf2ecc80f..36b02505a 100644 --- a/buildSrc/reproduce/build.gradle +++ b/gradle/plugins/reproduce-plugin/build.gradle @@ -25,10 +25,12 @@ plugins { id 'java-gradle-plugin' } +group = 'org.openjdk.skara.gradle' + gradlePlugin { plugins { simplePlugin { - id = 'org.openjdk.skara.gradle.reproduce' + id = 'reproduce' implementationClass = 'org.openjdk.skara.gradle.reproduce.ReproducePlugin' } } diff --git a/gradle/plugins/reproduce-plugin/settings.gradle b/gradle/plugins/reproduce-plugin/settings.gradle new file mode 100644 index 000000000..9f23c87ee --- /dev/null +++ b/gradle/plugins/reproduce-plugin/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'reproduce' diff --git a/buildSrc/reproduce/src/main/java/org/openjdk/skara/gradle/reproduce/ReproducePlugin.java b/gradle/plugins/reproduce-plugin/src/main/java/org/openjdk/skara/gradle/reproduce/ReproducePlugin.java similarity index 100% rename from buildSrc/reproduce/src/main/java/org/openjdk/skara/gradle/reproduce/ReproducePlugin.java rename to gradle/plugins/reproduce-plugin/src/main/java/org/openjdk/skara/gradle/reproduce/ReproducePlugin.java diff --git a/buildSrc/reproduce/src/main/java/org/openjdk/skara/gradle/reproduce/ReproduceTask.java b/gradle/plugins/reproduce-plugin/src/main/java/org/openjdk/skara/gradle/reproduce/ReproduceTask.java similarity index 100% rename from buildSrc/reproduce/src/main/java/org/openjdk/skara/gradle/reproduce/ReproduceTask.java rename to gradle/plugins/reproduce-plugin/src/main/java/org/openjdk/skara/gradle/reproduce/ReproduceTask.java diff --git a/buildSrc/version/build.gradle b/gradle/plugins/version-plugin/build.gradle similarity index 95% rename from buildSrc/version/build.gradle rename to gradle/plugins/version-plugin/build.gradle index d360c9bd8..76a262314 100644 --- a/buildSrc/version/build.gradle +++ b/gradle/plugins/version-plugin/build.gradle @@ -25,10 +25,12 @@ plugins { id 'java-gradle-plugin' } +group = 'org.openjdk.skara.gradle' + gradlePlugin { plugins { simplePlugin { - id = 'org.openjdk.skara.gradle.version' + id = 'version' implementationClass = 'org.openjdk.skara.gradle.version.VersionPlugin' } } diff --git a/gradle/plugins/version-plugin/settings.gradle b/gradle/plugins/version-plugin/settings.gradle new file mode 100644 index 000000000..98958edf8 --- /dev/null +++ b/gradle/plugins/version-plugin/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'version' diff --git a/buildSrc/version/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java b/gradle/plugins/version-plugin/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java similarity index 100% rename from buildSrc/version/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java rename to gradle/plugins/version-plugin/src/main/java/org/openjdk/skara/gradle/version/VersionPlugin.java diff --git a/settings.gradle b/settings.gradle index 7f3eb9682..4584dc56c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,6 +22,12 @@ */ rootProject.name = 'skara' +includeBuild 'gradle/plugins/proxy-plugin' +includeBuild 'gradle/plugins/module-plugin' +includeBuild 'gradle/plugins/images-plugin' +includeBuild 'gradle/plugins/version-plugin' +includeBuild 'gradle/plugins/reproduce-plugin' + include 'args' include 'bot' include 'ci'