mirror configuration model for config/info

.github/workflows/build.yml

@@ -1,47 +1,10 @@
 name: Build
 
 on:
+  push:
+    branches: [ master ]
   pull_request:
 
 jobs:
   build:
-    name: Build
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-    runs-on: ${{ matrix.os }}
-    if: startsWith(github.event.head_commit.message, 'Releasing version') != true
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Java
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'zulu'
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
-          restore-keys: |
-            ${{ runner.os }}-gradlew-
-
-      - name: Build
-        run: ./gradlew build -S
-
-      - name: Show Reports
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: reports-${{ runner.os }}
-          path: plugins/*/build/test-results/
+    uses: kordamp/kordamp-gradle-plugin-workflow/.github/workflows/build.yml@main

.github/workflows/early-access.yml

@@ -1,69 +1,16 @@
-name: "Early Access"
+name: 'Early Access'
 
 on:
   push:
     branches: [ master ]
 
 jobs:
   earlyaccess:
-    name: "Early Access"
+    name: 'Early Access'
     if: github.repository == 'kordamp/kordamp-gradle-plugins' && startsWith(github.event.head_commit.message, 'Releasing version') != true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up Java 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'zulu'
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
-          restore-keys: |
-            ${{ runner.os }}-gradlew-
-
-      - name: Build
-        run: ./gradlew -Prelease=true build -S
-
-      - name: Version
-        id: vars
-        run: echo ::set-output name=version::$(cat VERSION)
-
-      - name: Set up Java 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: 'zulu'
-
-      - name: Release
-        uses: jreleaser/release-action@v1
-        with:
-          arguments: release
-        env:
-          JRELEASER_PROJECT_VERSION: ${{ steps.vars.outputs.version }}
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-
-      - name: JReleaser output
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifact
-          path: |
-            out/jreleaser/trace.log
-            out/jreleaser/output.properties
+    uses: kordamp/kordamp-gradle-plugin-workflow/.github/workflows/early-access.yml@main
+    secrets:
+      github-token: ${{ secrets.GIT_ACCESS_TOKEN }}
+      gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      gpg-public-key: ${{ secrets.GPG_PUBLIC_KEY }}
+      gpg-secret-key: ${{ secrets.GPG_SECRET_KEY }}

.github/workflows/release.yml

@@ -4,86 +4,25 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Release version"
+        description: 'Release version'
         required: true
 
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up Java 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'zulu'
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
-          restore-keys: |
-            ${{ runner.os }}-gradlew-
-
-      - name: Set release version
-        run: |
-          VERSION=${{ github.event.inputs.version }}
-          echo $VERSION > VERSION
-          git add VERSION
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "GitHub Action"
-          git commit -a -m "Releasing version $VERSION"
-          git push origin master
-
-      - name: Deploy
-        env:
-          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-          GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
-          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
-        run: ./gradlew -Prelease=true -Pfull-release=true publishPlugins -S
-
-      - name: Set up Java 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: 'zulu'
-
-      - name: Release
-        uses: jreleaser/release-action@v1
-        with:
-          arguments: full-release
-        env:
-          JRELEASER_PROJECT_VERSION: ${{ github.event.inputs.version }}
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          JRELEASER_TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
-          JRELEASER_TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
-          JRELEASER_TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
-          JRELEASER_TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
-
-      - name: JReleaser output
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifact
-          path: |
-            out/jreleaser/trace.log
-            out/jreleaser/output.properties
-
-      - name: Guide
-        run: ./gradlew createGuide gitPublishPush -S
+    uses: kordamp/kordamp-gradle-plugin-workflow/.github/workflows/release.yml@main
+    with:
+      branch: master
+      version: ${{ github.event.inputs.version }}
+    secrets:
+      github-token: ${{ secrets.GIT_ACCESS_TOKEN }}
+      gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      gpg-public-key: ${{ secrets.GPG_PUBLIC_KEY }}
+      gpg-secret-key: ${{ secrets.GPG_SECRET_KEY }}
+      gpg-key-id: ${{ secrets.GPG_KEY_ID }}
+      gradle-publish-key: ${{ secrets.GRADLE_PUBLISH_KEY }}
+      gradle-publish-secret: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+      twitter-consumer-key: ${{ secrets.TWITTER_CONSUMER_KEY }}
+      twitter-consumer-secret: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+      twitter-access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+      twitter-access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}

build.gradle

@@ -96,6 +96,9 @@ gradleProjects.subprojects {
             testImplementation("org.spockframework:spock-junit4") {
                 exclude group: 'org.hamcrest', module: 'hamcrest-core'
             }
+
+            testImplementation gradleTestKit()
+            testImplementation 'com.agorapulse.testing:fixt:0.2.3'
         }
     }
 }

jreleaser.yml

@@ -34,6 +34,10 @@ release:
           title: '[chore]'
         - label: 'dependencies'
           title: '[deps]'
+        - label: 'docs'
+          title: '[docs]'
+        - label: 'build'
+          title: '[build]'
       categories:
         - title: '🚀 Features'
           labels:
@@ -44,12 +48,25 @@ release:
         - title: '🧰 Tasks'
           labels:
             - 'task'
+        - title: '📝 Documentation'
+          labels:
+            - 'docs'
         - title: '⚙️  Dependencies'
           labels:
             - 'dependencies'
+        - title: 'Build'
+          labels:
+            - 'build'
+      hide:
+        categories:
+          - 'Build'
+        contributors:
+          - 'GitHub'
       replacers:
         - search: '\[chore\] '
         - search: '\[deps\] '
+        - search: '\[docs\] '
+        - search: '\[build\] '
 
 announce:
   twitter:

plugins/base-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/base/BasePlugin.groovy

@@ -28,6 +28,7 @@ import org.kordamp.gradle.listener.ProjectEvaluatedListener
 import org.kordamp.gradle.listener.ProjectEvaluationListenerManager
 import org.kordamp.gradle.listener.TaskGraphReadyListener
 import org.kordamp.gradle.plugin.AbstractKordampPlugin
+import org.kordamp.gradle.plugin.base.extensions.ConfigExtension
 import org.kordamp.gradle.plugin.base.tasks.ArchivesTask
 import org.kordamp.gradle.plugin.base.tasks.ClearKordampFileCacheTask
 import org.kordamp.gradle.plugin.base.tasks.ConfigurationSettingsTask
@@ -70,6 +71,16 @@ class BasePlugin extends AbstractKordampPlugin {
     }
 
     void apply(Project project) {
+        ConfigExtension.create(project)
+        project.subprojects { Project p ->
+            ConfigExtension.create(p)
+        }
+
+        if (true) {
+            // TODO: remove after testing
+            return
+        }
+
         Banner.display(project)
         this.project = project
         ProjectEvaluationListenerManager.register(project.gradle)

plugins/base-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/base/extensions/BomExtension.java

@@ -0,0 +1,77 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2018-2021 Andres Almiray.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.kordamp.gradle.plugin.base.extensions;
+
+import org.gradle.api.Project;
+import org.gradle.api.plugins.ExtensionAware;
+import org.gradle.api.provider.MapProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.provider.SetProperty;
+import org.kordamp.gradle.plugin.base.util.ExtensionPath;
+import org.kordamp.gradle.plugin.base.util.ExtensionUtil;
+
+public interface BomExtension extends ExtensionAware {
+
+    String NAME = "bom";
+    ExtensionPath<ConfigExtension, BomExtension> PATH = ConfigExtension.PATH.append(NAME, BomExtension.class);
+
+    SetProperty<String> getExcludes();
+    SetProperty<String> getIncludes();
+
+    MapProperty<String, String> getProperties();
+
+    Property<Boolean> getAutoIncludes(); // true
+
+    Property<String> getParent();
+
+    Property<Boolean> getOverwriteInceptionYear();
+    Property<Boolean> getOverwriteUrl();
+    Property<Boolean> getOverwriteLicenses();
+    Property<Boolean> getOverwriteScm();
+    Property<Boolean> getOverwriteOrganization();
+    Property<Boolean> getOverwriteDevelopers();
+    Property<Boolean> getOverwriteContributors();
+    Property<Boolean> getOverwriteIssueManagement();
+    Property<Boolean> getOverwriteCiManagement();
+    Property<Boolean> getOverwriteMailingLists();
+
+    static BomExtension create(Project project) {
+        return ExtensionUtil.create(project, PATH, (ext, root) -> {
+            ext.getAutoIncludes().convention(root.getAutoIncludes().convention(true));
+
+            ext.getExcludes().convention(root.getExcludes());
+            ext.getIncludes().convention(root.getIncludes());
+
+            ext.getProperties().convention(root.getProperties());
+
+            ext.getParent().convention(root.getParent());
+
+            ext.getOverwriteInceptionYear().convention(root.getOverwriteInceptionYear());
+            ext.getOverwriteUrl().convention(root.getOverwriteUrl());
+            ext.getOverwriteLicenses().convention(root.getOverwriteLicenses());
+            ext.getOverwriteScm().convention(root.getOverwriteScm());
+            ext.getOverwriteOrganization().convention(root.getOverwriteOrganization());
+            ext.getOverwriteDevelopers().convention(root.getOverwriteDevelopers());
+            ext.getOverwriteContributors().convention(root.getOverwriteContributors());
+            ext.getOverwriteIssueManagement().convention(root.getOverwriteIssueManagement());
+            ext.getOverwriteCiManagement().convention(root.getOverwriteCiManagement());
+            ext.getOverwriteMailingLists().convention(root.getOverwriteMailingLists());
+        });
+    }
+
+}