Release 2.1.0-beta.6 with better metadata

.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:assembleDocs

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'org.ajoberstar.github-pages' version '1.2.0' apply false
     id 'com.github.hierynomus.license' version '0.14.0' apply false
     id 'io.ratpack.ratpack-java' version "1.6.1" apply false
-    id 'com.gradle.plugin-publish' version '0.14.0' apply false
+    id 'com.gradle.plugin-publish' version '1.1.0'
 }
 
 buildScan {
@@ -27,7 +27,7 @@ allprojects {
         olderJRubyVersion = '9.4.1.0'
         spockVersion = "org.spockframework:spock-core:1.2-groovy-2.4"
         pluginExtraText = (version.contains('-alpha') || version.contains('-beta')) ?
-            '(If you need a production-ready version of the JRuby/Gradle plugin use a 1.7.x release instead)': ''
+                '(If you need a production-ready version of the JRuby/Gradle plugin use a 1.7.x release instead)' : ''
     }
 }
 
@@ -78,7 +78,7 @@ subprojects {
             } else {
                 versions '4.10.2', '5.3.1', '6.0.1', '6.7', '7.6.1'
 
-                if(project.name == 'jruby-gradle-core-plugin' ) {
+                if (project.name == 'jruby-gradle-core-plugin') {
                     versions '4.3'
                 } else {
                     versions '4.9'
@@ -87,8 +87,8 @@ subprojects {
 
             dependsOn jar
         }
-        
-        pluginBundle {
+
+        gradlePlugin {
             website = 'https://github.com/jruby-gradle/jruby-gradle-plugin' // 'http://jruby-gradle.org/'
             vcsUrl = 'https://github.com/jruby-gradle/jruby-gradle-plugin.git'
         }
@@ -103,7 +103,7 @@ subprojects {
             def reportName = (codenarcSourceSetTask.name - 'codenarc').uncapitalize()
             def ideReport = reports.add(org.gradle.api.reporting.internal.TaskGeneratedSingleFileReport, 'ide', reports.task)
             ideReport.enabled = true
-            ideReport.destination = file( "${project.codenarc.reportsDir}/${reportName}.ide.txt")
+            ideReport.destination = file("${project.codenarc.reportsDir}/${reportName}.ide.txt")
         }
 
         tasks.withType(ValidateTaskProperties) { validateTaskProperties ->
@@ -112,7 +112,6 @@ subprojects {
         }
     }
 
-
     idea {
         module {
             downloadJavadoc = true

docs/build.gradle

@@ -5,7 +5,8 @@ buildscript {
     }
     dependencies {
         /* wow. so recursion */
-        classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.1.0-alpha.2"
+        classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.0.2"
+        classpath 'org.ysb33r.gradle:grolifant:0.17.0'
     }
 }
 apply plugin: 'groovy'

gradle.properties

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