Update build settings

.github/workflows/gradle.yml

@@ -27,23 +27,26 @@ jobs:
     env:
       CI: true
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/[email protected]
+
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v1.4.3
         with:
           java-version: 1.8
-      - uses: actions/cache@v1
+
+      - uses: actions/[email protected]
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - uses: actions/cache@v1
+
+      - uses: actions/[email protected]
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
           restore-keys: |
             ${{ runner.os }}-gradlew-
-      - uses: eskatos/gradle-command-action@v1
-        with:
-          arguments: build -S
+
+      - name: Build with Gradle
+        run: ./gradlew build -S

build.gradle

@@ -97,7 +97,7 @@ allprojects {
     apply plugin: 'idea'
 
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
 

diagrams/diagrams.gradle

@@ -15,25 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-buildscript {
-    repositories {
-        jcenter()
-        gradlePluginPortal()
-    }
 
-    dependencies {
-        classpath "org.asciidoctor:asciidoctor-gradle-plugin:$asciidoctorVersion"
-        classpath 'org.asciidoctor:asciidoctorj-diagram:1.5.18'
-    }
+plugins {
+    id 'org.asciidoctor.jvm.convert'
 }
 
-apply plugin: 'org.asciidoctor.convert'
-
-asciidoctor {
+asciidoctorj {
     options doctype: 'book'
 
-    backends = ['html5']
-    requires = ['asciidoctor-diagram']
+    modules {
+        diagram.use()
+        diagram.version '2.1.0'
+    }
 
     attributes 'source-highlighter'    : 'coderay',
         'coderay-linenums-mode' : 'table',

gradle.properties

@@ -21,8 +21,8 @@ group                = javax.application
 sourceCompatibility  = 1.8
 targetCompatibility  = 1.8
 
-asciidoctorVersion   = 1.6.1
-kordampPluginVersion = 0.42.0
+asciidoctorVersion   = 3.3.2
+kordampPluginVersion = 0.44.0
 
 org.gradle.daemon    = true
 org.gradle.caching   = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jsr377-spec/jsr377-spec.gradle

@@ -15,28 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-buildscript {
-    repositories {
-        jcenter()
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-        classpath 'org.asciidoctor:asciidoctorj-diagram:1.5.18'
-    }
-}
 
 plugins {
-    id 'org.asciidoctor.convert'
+    id 'org.asciidoctor.jvm.convert'
+    id 'org.asciidoctor.jvm.pdf'
 }
 
-asciidoctor {
-    dependsOn project(':diagrams').asciidoctor
+asciidoctorj {
     options doctype: 'book'
 
-    backends = ['html5']
-    requires = ['asciidoctor-diagram']
+    modules {
+        diagram.use()
+        diagram.version '2.1.0'
+    }
 
     attributes 'source-highlighter'    : 'coderay',
                'coderay-linenums-mode' : 'table',
@@ -46,14 +37,23 @@ asciidoctor {
                linkattrs               : true,
                encoding                : 'utf-8'
 
+}
+
+asciidoctor {
+    dependsOn project(':diagrams').asciidoctor
+
+    baseDirFollowsSourceDir()
+
     sources {
         include 'index.adoc'
     }
 
     resources {
         from file('src/resources')
-        from(project(':diagrams').file('build/asciidoc/html5/images')) {
+        from(project(':diagrams').file('build/docs/asciidoc/images')) {
             into 'images'
         }
     }
 }
+
+build.dependsOn(asciidoctor)

settings.gradle

@@ -17,22 +17,24 @@
  */
 pluginManagement {
     repositories {
-        jcenter()
         gradlePluginPortal()
+        mavenCentral()
         mavenLocal()
     }
     plugins {
         id 'org.kordamp.gradle.java-project' version kordampPluginVersion
         id 'org.kordamp.gradle.bintray'      version kordampPluginVersion
         id 'org.jonnyzzz.java9c'             version '0.2.3'
         id 'org.beryx.jar'                   version '1.2.0'
-        id 'org.asciidoctor.convert'         version asciidoctorVersion
+        id 'org.asciidoctor.jvm.convert'     version asciidoctorVersion
+        id 'org.asciidoctor.jvm.pdf'         version asciidoctorVersion
     }
 }
 
 buildscript {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
         mavenLocal()
     }
     dependencies {