Merge pull request #742 from jonbullock/merge/configure-jreleaser-737

Manually merge in JReleaser PR

.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: Build
+
+on:
+    pull_request:
+
+jobs:
+    build:
+        name: Build
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ ubuntu-latest, macos-latest, windows-latest ]
+        runs-on: ${{ matrix.os }}
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Set up Java
+              uses: actions/setup-java@v2
+              with:
+                  java-version: 11
+                  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: Upload Reports
+              uses: actions/upload-artifact@v1
+              if: failure()
+              with:
+                  name: reports-${{ runner.os }}
+                  path: |
+                      jbake-core/build
+                      jbake-dist/build

.github/workflows/early-access.yml

@@ -0,0 +1,55 @@
+name: EarlyAccess
+
+on:
+    push:
+        branches: [ master ]
+
+jobs:
+    earlyaccess:
+        name: EarlyAccess
+        if: github.repository == 'jbake-org/jbake'
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+
+            - name: Set up Java
+              uses: actions/setup-java@v2
+              with:
+                  java-version: 11
+                  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: Release
+              run: ./gradlew jreleaserRelease -S
+              env:
+                  JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_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: jreleaser-logs
+                  path: |
+                      jbake-dist/build/jreleaser/trace.log
+                      jbake-dist/build/jreleaser/output.properties

build.gradle

@@ -4,6 +4,7 @@ plugins {
     id "io.github.gradle-nexus.publish-plugin"  version "$nexusPublishPluginVersion"
     id 'com.github.ben-manes.versions'          version "$versionsPluginVersion"
     id 'org.ajoberstar.grgit'                   version "$grgitVersion"
+    id 'org.jreleaser'                          version "$jreleaserVersion" apply false
     id "eclipse"
     id "idea"
 }

gradle.properties

@@ -45,9 +45,9 @@ jacocoVersion               = 0.8.7
 grgitVersion                = 4.1.1
 nexusPublishPluginVersion   = 1.1.0
 versionsPluginVersion       = 0.40.0
-sdkmanVersion               = 3.0.0
-githubReleaseVersion        = 2.2.12
 optionalBaseVersion         = 7.0.0
+jreleaserVersion            = 0.10.0
+mavenPluginDevVersion       = 0.3.1
 
 # jbake-maven-plugin dependencies
 mavenVersion                = 3.8.4

gradle/release.gradle

@@ -0,0 +1,58 @@
+apply plugin: 'org.jreleaser'
+
+// cannot reference project. properties inside jreleaser config block
+// as that collides with the "project" DSL element of the config extension
+ext.releaseIsDryrun = (project.rootProject.findProperty('dryrun') ?: false).toBoolean()
+ext.projectWebsite = project.website
+
+jreleaser {
+    dryrun = releaseIsDryrun
+    gitRootSearch = true
+
+    project {
+        website = projectWebsite
+        authors = ['Jonathan Bullock']
+        license = 'MIT'
+        extraProperties.put('inceptionYear', '2012')
+    }
+
+    release {
+        github {
+            overwrite = true
+            branch = 'master'
+            changelog {
+                formatted = 'always'
+                format = '- {{commitShortHash}} {{commitTitle}}'
+                contributors {
+                    format = '- {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}}'
+                }
+                hide {
+                    contributors = ['GitHub']
+                }
+            }
+        }
+    }
+
+    signing {
+        active = 'always'
+        armored = true
+    }
+
+    checksum {
+        individual = true
+    }
+
+    distributions {
+        jbake {
+            sdkman {
+                active = 'release'
+            }
+            artifact {
+                path = 'build/distributions/{{distributionName}}-{{projectVersion}}-bin.zip'
+            }
+            artifact {
+                path = 'build/distributions/{{distributionName}}-{{projectVersion}}.tar'
+            }
+        }
+    }
+}

jbake-core/build.gradle

@@ -7,7 +7,6 @@ plugins {
 }
 
 apply from: "$rootDir/gradle/maven-publishing.gradle"
-apply from: "$rootDir/gradle/signing.gradle"
 
 description = "The core library of JBake"
 

jbake-dist/build.gradle

@@ -1,15 +1,10 @@
 plugins {
-    id "io.sdkman.vendors"  version "$sdkmanVersion"
-    id "com.github.breadmoirai.github-release" version "$githubReleaseVersion"
     id "org.jbake.convention.java-common"
     id 'application'
 }
 
 apply from: "$rootDir/gradle/application.gradle"
-apply from: "$rootDir/gradle/sdkman.gradle"
-apply from: "$rootDir/gradle/signing.gradle"
-apply from: "$rootDir/gradle/github-releases.gradle"
-
+apply from: "$rootDir/gradle/release.gradle"
 description = "The binary distribution package that bundles JBake cli"
 
 sourceSets {
@@ -58,17 +53,6 @@ smokeTest {
     }
 }
 
-task buildChecksum(dependsOn: distZip, group: "distribution") {
-    description "creates a sha256 checksum file for the distribution"
-    doLast {
-        distZip.outputs.files.files.each {
-            ant.checksum(file: it, fileext: ".sha256", algorithm: "SHA-256", pattern: "{0} {1}")
-        }
-    }
-}
-
 check.dependsOn smokeTest
 
-distZip.finalizedBy buildChecksum
-
 jar.enabled=false

jbake-maven-plugin/build.gradle

@@ -1,12 +1,15 @@
 plugins {
-    id 'de.benediktritter.maven-plugin-development' version '0.3.1'
+    id 'de.benediktritter.maven-plugin-development' version "$mavenPluginDevVersion"
     id "org.jbake.convention.java-common"
 }
 
 group = "org.jbake"
 
+mavenPlugin {
+    helpMojoPackage = 'org.jbake.maven'
+}
+
 apply from: "$rootDir/gradle/maven-publishing.gradle"
-apply from: "$rootDir/gradle/signing.gradle"
 
 publishing {
     publications {