Merge pull request #106 from robertpanzer/fix-jruby-gradle-plugin

Fix jruby-gradle-plugin & asciidoctor-pdf 2.3.18

.github/workflows/continuous-integration.yaml

@@ -14,7 +14,6 @@ jobs:
       max-parallel: 2
       matrix:
         java:
-          - '8'
           - '11'
           - '17'
         os:

.github/workflows/upstream.yaml

@@ -16,7 +16,6 @@ jobs:
       max-parallel: 2
       matrix:
         java:
-          - '8'
           - '11'
           - '17'
     runs-on: ubuntu-latest

asciidoctorj-pdf/build.gradle

@@ -28,7 +28,6 @@ dependencies {
   gems "rubygems:text-hyphen:$textHyphenVersion"
   gems "rubygems:ttfunk:$ttfunkGemVersion"
   gems "rubygems:css_parser:$cssParserGemVersion"
-  gems "rubygems:rexml:$rexmlGemVersion"
 
   testImplementation "org.apache.pdfbox:pdfbox:$pdfboxVersion"
 }

asciidoctorj-pdf/gradle.properties

@@ -1,4 +1,4 @@
 properName=AsciidoctorJ PDF
 description=AsciidoctorJ PDF bundles the Asciidoctor PDF RubyGem (asciidoctor-pdf) so it can be loaded into the JVM using JRuby.
-version=2.3.17
+version=2.3.18
 gem_name=asciidoctor-pdf

build.gradle

@@ -12,13 +12,19 @@ buildscript {
     mavenCentral()
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
   }
+  dependencies {
+    classpath("com.github.jruby-gradle:jruby-gradle-plugin:2.0.1") {
+      exclude module: 'grolifant'
+      exclude module: 'okhttp-digest'
+    }
+    classpath 'org.ysb33r.gradle:grolifant:0.17.0'
+  }
 }
 
 // modern plugins config
 plugins {
   id "signing"
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
-  id 'com.github.jruby-gradle.base' version '2.0.0'
 }
 
 // TIP use -PpublishRelease=true to active release behavior regardless of the version
@@ -31,22 +37,21 @@ ext {
   statusIsRelease = (status == 'release')
 
   // jar versions
-  jrubyVersion = '9.4.0.0'
+  jrubyVersion = '9.4.8.0'
   pdfboxVersion = '3.0.0'
   junitVersion = '5.10.0'
   assertjVersion = '3.24.2'
 
   // gem versions
   asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.7'
-  asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.17'
+  asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.18'
 
   addressableVersion = '2.8.0'
   concurrentRubyVersion = '1.1.7'
   public_suffixVersion = '1.4.6'
   prawnGemVersion=project.hasProperty('prawnGemVersion') ? project.prawnGemVersion : '2.4.0'
   prawnSvgGemVersion = "0.34.1"
   rghostGemVersion = '0.9.7'
-  rexmlGemVersion = '3.2.6'
   threadSafeGemVersion = '0.3.6'
   ttfunkGemVersion = '1.7.0'
   cssParserGemVersion = '1.12.0'

gradle.properties

@@ -1,4 +1,4 @@
-version=2.3.17
+version=2.3.18
 sourceCompatibility=1.8
 targetCompatibility=1.8