From 4bb576dae41db3e35f8e3f97140e7b9f69a416a5 Mon Sep 17 00:00:00 2001 From: Robert Panzer Date: Tue, 4 Jun 2024 17:38:11 +0200 Subject: [PATCH 1/2] Upgrade to asciidoctor-pdf 2.3.17 --- asciidoctorj-pdf/build.gradle | 2 ++ asciidoctorj-pdf/gradle.properties | 2 +- build.gradle | 3 ++- gradle.properties | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/asciidoctorj-pdf/build.gradle b/asciidoctorj-pdf/build.gradle index 85e7d1d..d92f092 100644 --- 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 index 7676d86..4e36b77 100644 --- 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 index a7732e8..6978434 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ 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' @@ -46,6 +46,7 @@ ext { 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 index 56e904c..fd0f77b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.3.15 +version=2.3.17 sourceCompatibility=1.8 targetCompatibility=1.8 From a15fc1f0a37777b658cb27031063d8805512d8ac Mon Sep 17 00:00:00 2001 From: Robert Panzer Date: Tue, 4 Jun 2024 17:43:42 +0200 Subject: [PATCH 2/2] Use macos-13 for ci build --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index c45b582..82b288e 100644 --- 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