Merge pull request #701 from Goooler/development-4.x

Minor updates
asciidoctor · Jan 9, 2024 · 196dd88 · 196dd88
2 parents c7d57aa + ce6f355
commit 196dd88
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 74 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,58 +4,47 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: zulu
-      # Licensing
-      - name: Licensing
-        uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@v2
         with:
-          arguments: --console=plain -S license
-      # Coding style
+          gradle-home-cache-cleanup: true
+      - name: Licensing
+        run: ./gradlew --console=plain -S license
       - name: Coding style
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: --console=plain -S codenarcAll
+        run: ./gradlew --console=plain -S codenarcAll
   build-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v1
-        # use a short path to avoid exceeding the path limit on Windows... sigh
-        with:
-          path: 'w'
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: zulu
+      - uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
       - name: Cache offline repository
         uses: actions/cache@v3
         with:
           path: testfixtures/offline-repo/build/repo
           key: ${{ runner.os }}-offline-repo-${{ hashFiles('module-versions.properties') }}
           restore-keys: ${{ runner.os }}-offline-repo-
-      # Build
       - name: Build offline repository
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: --console=plain --no-build-cache :testfixtures-offline-repo:buildOfflineRepositories
+        run: ./gradlew --console=plain --no-build-cache :testfixtures-offline-repo:buildOfflineRepositories
       - name: Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: --console=plain --warning-mode=all -s clean assemble
-      # Test
+        run: ./gradlew --console=plain --warning-mode=all -s clean assemble
       # TODO: Resolve the gem integration test issue.  See https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/694
       - name: Test
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: --console=plain --warning-mode=all -s check --no-parallel -Djava.net.preferIPv4Stack=true -x gradleTest -x :asciidoctor-gradle-jvm-gems:IntTest --scan
+        run: ./gradlew --console=plain --warning-mode=all -s check --no-parallel -x gradleTest -x :asciidoctor-gradle-jvm-gems:IntTest --scan
+        env:
+          JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true
       # Stop gradlew to avoid locking issues
       - name: Cleanup
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: --stop
+        run: ./gradlew --stop
   build:
     strategy:
       matrix:
@@ -65,40 +54,30 @@ jobs:
         # java: [ 8, 11 ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: zulu
+    - uses: gradle/gradle-build-action@v2
+      with:
+        gradle-home-cache-cleanup: true
     - name: Cache offline repository
       uses: actions/cache@v3
       with:
         path: testfixtures/offline-repo/build/repo
         key: ${{ runner.os }}-offline-repo-${{ hashFiles('module-versions.properties') }}
         restore-keys: ${{ runner.os }}-offline-repo-
     - name: Build offline repository
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: --console=plain --no-build-cache :testfixtures-offline-repo:buildOfflineRepositories
-    # Build
+      run: ./gradlew --console=plain --no-build-cache :testfixtures-offline-repo:buildOfflineRepositories
     - name: Build
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: -i -S --console=plain --no-build-cache assemble
-    # Integration tests
+      run: ./gradlew  -i -S --console=plain --no-build-cache assemble
     - name: Integration tests (without slides)
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: -i -s --console=plain --no-build-cache test intTest remoteTest --scan
+      run: ./gradlew  -i -s --console=plain --no-build-cache test intTest remoteTest --scan
 #        arguments: -i -s --console=plain --no-build-cache test intTest remoteTest  -x asciidoctor-gradle-jvm-slides:intTest
 #        arguments: -i -s --console=plain --no-build-cache test intTest remoteTest -x asciidoctor-gradle-slides-export:intTest -x asciidoctor-gradle-jvm-slides:intTest
 #    TODO: See https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/695
 #    - name: Integration tests (slides only)
-#      uses: eskatos/gradle-command-action@v2
-#      with:
-#        arguments: -i -s --console=plain --no-build-cache test asciidoctor-gradle-jvm-slides:intTest asciidoctor-gradle-slides-export:intTest
-    # Gradle tests
+#      uses: ./gradlew -i -s --console=plain --no-build-cache test asciidoctor-gradle-jvm-slides:intTest asciidoctor-gradle-slides-export:intTest
     - name: Gradle tests
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: -i -s --console=plain --no-build-cache gradleTest --scan
+      run: ./gradlew -i -s --console=plain --no-build-cache gradleTest --scan
diff --git a/.github/workflows/push-documentation.yml b/.github/workflows/push-documentation.yml
@@ -7,21 +7,19 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: zulu
-      - name: Combine documentation
-        uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@v2
         with:
-          build-root-directory: docs
-          arguments: --console=plain -q combineDocs
+          gradle-home-cache-cleanup: true
+      - run: cd docs
+      - name: Combine documentation
+        run: ./gradlew --console=plain -q combineDocs
       - name: Publish documentation
-        uses: gradle/gradle-build-action@v2
-        with:
-          build-root-directory: docs
-          arguments: "--console=plain --info :antora:publishDocs :gh-pages:publishDocs
+        run: ./gradlew --console=plain --info :antora:publishDocs :gh-pages:publishDocs
           -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GITHUB_PUBLISH_USER }}
           -Dorg.ajoberstar.grgit.auth.password=${{ secrets.GITHUB_PUBLISH_KEY }}
-          -Dorg.ajoberstar.grgit.auth.force=hardcoded"
+          -Dorg.ajoberstar.grgit.auth.force=hardcoded
diff --git a/build.gradle b/build.gradle
@@ -15,18 +15,18 @@
  */
 
 plugins {
-    id 'net.nemerosa.versioning' version '2.6.1' apply false
-    id 'com.github.ben-manes.versions' version '0.17.0' apply false
+    id 'net.nemerosa.versioning' version '2.15.1' apply false
+    id 'com.github.ben-manes.versions' version '0.50.0' apply false
     id 'com.github.hierynomus.license' version '0.16.1' apply false
-    id 'com.github.kt3k.coveralls' version '2.8.2' apply false
-    id 'net.ossindex.audit' version '0.1.1' apply false
+    id 'com.github.kt3k.coveralls' version '2.12.2' apply false
+    id 'net.ossindex.audit' version '0.4.11' apply false
     id 'org.kordamp.jdeps' version '0.2.0' apply false
-    id 'fi.linuxbox.download.worker' version '0.3' apply false
+    id 'fi.linuxbox.download.worker' version '0.4' apply false
     id 'org.ysb33r.ivypot' version '1.0.0' apply false
-    id 'org.ysb33r.os' version '0.9' apply false
-    id 'org.ysb33r.cloudci' version '2.5' apply false
-    id 'org.ysb33r.cloudci.appveyor.testreporter' version '2.5' apply false
-    id 'org.ysb33r.gradletest' version '3.0.0-alpha.3' apply false
+    id 'org.ysb33r.os' version '1.0.0' apply false
+    id 'org.ysb33r.cloudci' version '4.0.0' apply false
+    id 'org.ysb33r.cloudci.appveyor.testreporter' version '4.0.0' apply false
+    id 'org.ysb33r.gradletest' version '3.0.0-alpha.4' apply false
     id 'idea'
 }
 

diff --git a/docs/build.gradle b/docs/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'idea'
     id 'org.asciidoctor.jvm.convert' apply false
     id 'org.asciidoctor.editorconfig' apply false
-    id 'org.ajoberstar.git-publish' version '2.1.1' apply false
+    id 'org.ajoberstar.git-publish' version '4.2.1' apply false
 }
 
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -10,16 +10,16 @@ project_issues      = https://github.com/asciidoctor/asciidoctor-gradle-plugin/i
 project_vcs         = https://github.com/asciidoctor/asciidoctor-gradle-plugin.git
 
 cglibVersion           = 3.3.0
-jsoupVersion           = 1.13.1
+jsoupVersion           = 1.17.2
 spockVersion           = 2.3-groovy-3.0
 grolifantVersion       = 2.2.3
 jacocoVersion          = 0.8.6
 codenarcVersion        = 3.3.0
 nodejsGradleVersion    = 2.2.0
-pluginJrubySimpleVersion = 1.0.0
+pluginJrubySimpleVersion = 1.0.1
 pluginPublishPlugin = 1.2.1
 
-org.gradle.daemon   = true
+org.gradle.caching  = true
 org.gradle.parallel = true
 
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=768m 
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}
diff --git a/testfixtures/jvm/build.gradle b/testfixtures/jvm/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     implementation gradleApi()
     implementation gradleTestKit()
     api "org.ysb33r.gradle:grolifant-herd:${agProject.versionOf('grolifant')}"
-    api 'commons-io:commons-io:2.6'
+    api 'commons-io:commons-io:2.15.1'
     implementation "org.jsoup:jsoup:$jsoupVersion"
     implementation "cglib:cglib-nodep:$cglibVersion"
     implementation("org.spockframework:spock-core:${agProject.versionOf('spock')}") {