Merge pull request #104 from robertpanzer/asciidoctor-2.3.17

Upgrade to asciidoctor-pdf 2.3.17
asciidoctor · Jun 6, 2024 · c2bf3ad · c2bf3ad
2 parents 193f877 + a15fc1f
commit c2bf3ad
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -19,7 +19,7 @@ jobs:
           - '17'
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-13
     runs-on: ${{ matrix.os }}
     steps:
       - name: Fetch Sources

diff --git a/asciidoctorj-pdf/build.gradle b/asciidoctorj-pdf/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     exclude module: 'thread_safe'
     exclude module: 'prawn'
     exclude module: 'addressable'
+    exclude module: 'rexml'
     exclude module: 'public_suffix'
     exclude module: 'ttfunk'
     exclude module: 'concurrent-ruby'
@@ -27,6 +28,7 @@ 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"
 }

diff --git a/asciidoctorj-pdf/gradle.properties b/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.15
+version=2.3.17
 gem_name=asciidoctor-pdf
diff --git a/build.gradle b/build.gradle
@@ -38,14 +38,15 @@ ext {
 
   // gem versions
   asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.7'
-  asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.15'
+  asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.17'
 
   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'

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.3.15
+version=2.3.17
 sourceCompatibility=1.8
 targetCompatibility=1.8