Release 2.1.0-beta.5 with GitHub Pages

.github/workflows/build.yml

@@ -1,26 +1,15 @@
 name: Build
-on: [push, pull_request]
+on: [ push, pull_request ]
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 11
-      # Cache
-      - name: Cache .gradle/caches
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle-cache-
-      - name: Cache .gradle/wrapper
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle-wrapper-
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
       # Licensing
       - name: Licensing
         uses: eskatos/gradle-command-action@v1
@@ -38,22 +27,11 @@ jobs:
         # use a short path to avoid exceeding the path limit on Windows... sigh
         with:
           path: 'w'
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: 11
-      # Cache
-      - name: Cache .gradle/caches
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle-cache-
-      - name: Cache .gradle/wrapper
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle-wrapper-
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
       # Build
       - name: Build
         uses: eskatos/gradle-command-action@v1
@@ -89,84 +67,60 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ ubuntu-latest, macos-latest ]
         java: [ 8, 11 ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-java@v1
-      with:
-        java-version: ${{ matrix.java }}
-    # Cache
-    - name: Cache .gradle/caches
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle-cache-
-    - name: Cache .gradle/wrapper
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle-wrapper-
-    # Build
-    - name: Build
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: -i -S --console=plain --no-build-cache assemble validateTaskProperties
-      # Unit tests
-    - name: Unit tests
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: -i -s --console=plain --no-build-cache test
-    # Integration tests
-    - name: Integration tests
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: -i -s --console=plain --no-build-cache intTest
-    # Gradle tests
-    - name: Compatibility tests
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: -i -s --console=plain --no-build-cache gradleTest
-    - name: Store reports
-      uses: actions/upload-artifact@v2
-      if: always()
-      with:
-        name: Test reports
-        path: "**/build/reports/**"
-        retention-days: 5
+      - uses: actions/checkout@v1
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          cache: 'gradle'
+      # Build
+      - name: Build
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: -i -S --console=plain --no-build-cache assemble validateTaskProperties
+        # Unit tests
+      - name: Unit tests
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: -i -s --console=plain --no-build-cache test
+      # Integration tests
+      - name: Integration tests
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: -i -s --console=plain --no-build-cache intTest
+      # Gradle tests
+      - name: Compatibility tests
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: -i -s --console=plain --no-build-cache gradleTest
+      - name: Store reports
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: Test reports
+          path: "**/build/reports/**"
+          retention-days: 5
   publish:
     runs-on: ubuntu-latest
-#    on:
-#      push:
-#        branches:
-#          - release
     needs: build
     if: ${{ github.repository == 'jruby-gradle/jruby-gradle-plugin' && github.ref == 'refs/heads/release' }}
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Cache .gradle/caches
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle-cache-
-    - name: Cache .gradle/wrapper
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle-wrapper-
-    - name: Publish to Gradle Portal
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: -i --console=plain --no-build-cache assemble publishPlugins -Dgradle.publish.key=${{ secrets.PUBLISH_KEY }} -Dgradle.publish.secret=${{ secrets.PUBLISH_SECRET }}
-    - name: Publish documentation
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: -i --console=plain --no-build-cache docs:publishGhPages -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GH_PAGES_PUSH_USER }} -Dorg.ajoberstar.grgit.auth.password=${{ secrets.GH_PAGES_PUSH_TOKEN }} -Dorg.ajoberstar.grgit.auth.force=hardcoded
+      - uses: actions/checkout@v1
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
+          cache: 'gradle'
+      - name: Publish to Gradle Portal
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: -i --console=plain --no-build-cache assemble publishPlugins -Dgradle.publish.key=${{ secrets.PUBLISH_KEY }} -Dgradle.publish.secret=${{ secrets.PUBLISH_SECRET }}
+      - name: Publish documentation
+        uses: eskatos/gradle-command-action@v1
+        with:
+#          arguments: -i --console=plain --no-build-cache docs:publishGhPages -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GH_PAGES_PUSH_USER }} -Dorg.ajoberstar.grgit.auth.password=${{ secrets.GH_PAGES_PUSH_TOKEN }} -Dorg.ajoberstar.grgit.auth.force=hardcoded
+          arguments: -i --console=plain --no-build-cache docs:publishGhPages -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GH_PAGES_PUSH_TOKEN }} -Dorg.ajoberstar.grgit.auth.password=${{ secrets.GH_PAGES_PUSH_TOKEN }} -Dorg.ajoberstar.grgit.auth.force=hardcoded

core-plugin/README.adoc

@@ -63,7 +63,7 @@ gemResolverStrategy {
   excludeConfigurations 'foo', 'bar'  // <1>
   excludeModule 'foo.*' // <2>
   excludeModule 'foo.*', /1\.2.*/ // <3>
-  useGemVersionResolver 'gems2'
+  useGemVersionResolver 'gems2' // <4>
 }
 ----
 <1> Exclude configurations `foo` and `bar` from being considered for GEM resolver strategies.

docs/_config/site.yml

@@ -1,7 +1,7 @@
 base_url: http://jruby-gradle.org/
 local_tz: UTC
-haml:
-  :ugly: true
+generation:
+  :in_threads: 0
 asciidoctor:
   :safe: unsafe
   :base_dir: null

docs/build.gradle

@@ -5,7 +5,8 @@ buildscript {
     }
     dependencies {
         /* wow. so recursion */
-        classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.1.1"
+        classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.0.2"
+        classpath 'org.ysb33r.gradle:grolifant:0.17.0'
     }
 }
 apply plugin: 'groovy'
@@ -18,14 +19,18 @@ configurations {
     asciidoctor
 }
 
-dependencies {
-    asciidoctor('rubygems:awestruct:0.5.5')
-    asciidoctor('rubygems:coderay:1.1.0')
+repositories {
+    ruby.gems()
+}
 
-    /* later versions of 1.6.x have a dependency incompatibility with
-     * mime-types 2.x
-     */
-    asciidoctor('rubygems:rest-client:1.6.7') { force = true }
+dependencies {
+    asciidoctor('rubygems:awestruct:0.6.6')
+    asciidoctor('rubygems:coderay:1.1.3')
+    asciidoctor('rubygems:http_parser.rb:0.6.0')
+    asciidoctor('rubygems:public_suffix:4.0.7')
+    asciidoctor('rubygems:spoon:0.0.6')
+    asciidoctor('rubygems:htmlcompressor:0.4.0')
+    asciidoctor('rubygems:uglifier:4.2.0')
 }
 
 task prepareGroovyDocs(type: Copy) {

docs/plugins/storm.adoc

@@ -16,7 +16,7 @@ documentation intends only to cover the JRuby Gradle plugin's functionality.
 [source,gradle]
 .build.gradle
 ----
-include::../examples/basic-topology.gradle[]
+include::examples/basic-topology.gradle[]
 ----
 
 

examples/run-ruby-binscript/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     /* Using the built-in `gems` configuration to describe the
      * dependencies our JRubyExec-based tasks will need.
      */
-    gems "rubygems:asciidoctor:1.5.2+"
+    gems "rubygems:asciidoctor:2.0.20+"
 }
 
 task verifyAsciidoctorWorks(type: JRubyExec) {

gradle.properties

@@ -1,4 +1,4 @@
-version=2.1.0-beta.2
+version=2.1.0-beta.5
 group=com.github.jruby-gradle
 copyrightYear=2014-2023