Build with Gradle 7 rc-1 and a single JDK (version 16.0.0) (#16)

* Upgrade to Gradle 7.0-RC-1
* Use siordache-forks version of Gradle License Plugin
* GithubCI: Single JDK16 via one setup-java step

.github/workflows/gradle.yml

@@ -14,18 +14,12 @@ jobs:
     steps:
     - name: Git checkout
       uses: actions/checkout@v1
-    - name: Set up JDK (via matrix) for Gradle Java Toolchain
-      id: setupjdk-toolchain
+    - name: Set up JDK (via matrix) for Gradle and Gradle Java Toolchain
+      id: setupjdk
       uses: actions/setup-java@v2-preview
       with:
         distribution: 'adopt'
         java-version: ${{ matrix.java }}
-    - name: Setup JDK for Gradle JVM
-      id: setupjdk-gradle
-      uses: actions/setup-java@v2-preview
-      with:
-        distribution: 'adopt'
-        java-version: '15'
     - name: Verify Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
     - name: Cache Gradle packages
@@ -37,8 +31,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew buildCI buildJPackages --scan --info --stacktrace
       env:
-        JAVA_HOME: ${{ steps.setupjdk-gradle.outputs.path }}
-        JDK16: ${{ steps.setupjdk-toolchain.outputs.path }}
+        JAVA_HOME: ${{ steps.setupjdk.outputs.path }}
     - name: Upload DMG as an artifact
       uses: actions/upload-artifact@v2
       with:

build.gradle

@@ -1,5 +1,10 @@
 buildscript {
+    repositories {
+        maven { url 'https://jitpack.io' } // For siordache-forks license plugin
+    }
     dependencies {
+        // Use siordache-forks license plugin until a version supporting Gradle 7 is released
+        classpath "com.github.siordache-forks:license-gradle-plugin:v0.16.1"
         classpath "org.asciidoctor:asciidoctorj:${asciidoctorjVersion}"
         //classpath "org.asciidoctor:asciidoctorj-diagram:${asciidoctorjDiagramVersion}"
     }
@@ -10,7 +15,8 @@ plugins {
     id 'com.jfrog.bintray'                  version '1.8.4'
     id 'org.openjfx.javafxplugin'           version '0.0.9'  apply false
     id 'org.beryx.jlink'                    version '2.23.5' apply false
-    id 'com.github.hierynomus.license'      version '0.15.0' apply false
+//  Waiting for new release of license plugin that supports Gradle 7
+//    id 'com.github.hierynomus.license'      version '0.15.0' apply false
 }
 
 buildScan {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
-distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip
+distributionSha256Sum=12b807b5d6b065f05e0e47d8d00e9d55fe26d3cfc6cdb22d6825a93940edec90
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists