From bf35c2d8c8472fe243e88a0927d1f602c58e73b4 Mon Sep 17 00:00:00 2001 From: Robert Panzer Date: Fri, 21 Oct 2022 11:27:18 +0200 Subject: [PATCH 1/3] Upgrade to asciidoctor-pdf 2.3.3 --- asciidoctorj-pdf/gradle.properties | 2 +- build.gradle | 6 +++--- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/asciidoctorj-pdf/gradle.properties b/asciidoctorj-pdf/gradle.properties index cf54ea4..8dbb3f2 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.0 +version=2.3.3 gem_name=asciidoctor-pdf diff --git a/build.gradle b/build.gradle index 36aaccc..b4d3aa6 100644 --- a/build.gradle +++ b/build.gradle @@ -33,14 +33,14 @@ ext { // jar versions arquillianVersion = '1.1.10.Final' arquillianSpockVersion = '1.0.0.Beta3' - jrubyVersion = '9.3.4.0' + jrubyVersion = '9.3.8.0' pdfboxVersion = '1.8.16' junitVersion = '4.13.2' hamcrestVersion = '2.2' // gem versions - asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.5' - asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.0' + asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.7' + asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.3' addressableVersion = '2.8.0' concurrentRubyVersion = '1.1.7' diff --git a/gradle.properties b/gradle.properties index ab0f3ec..93d9bf4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=2.3.0 +version=2.3.3 sourceCompatibility=1.8 targetCompatibility=1.8 From 544f5c16ba8d0ee60ef207afc6bedf92cc5e1d12 Mon Sep 17 00:00:00 2001 From: Robert Panzer Date: Fri, 21 Oct 2022 11:35:46 +0200 Subject: [PATCH 2/3] Update github actions --- .github/workflows/continuous-integration.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index e6f66da..ae5c100 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -26,12 +26,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Fetch Sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: temurin java-version: ${{ matrix.java }} - name: Build run: | @@ -48,10 +48,11 @@ jobs: - '11' - '17' steps: - - uses: actions/checkout@v2 + - name: Fetch Sources + uses: actions/checkout@v3 with: fetch-depth: 1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: temurin java-version: ${{ matrix.java }} From 7530ae99d4d5ff51ec8702562ee1f5e1c42465b6 Mon Sep 17 00:00:00 2001 From: Robert Panzer Date: Fri, 21 Oct 2022 11:48:38 +0200 Subject: [PATCH 3/3] Downgrade jruby and try to fix build issue --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b4d3aa6..a8cce40 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ ext { // jar versions arquillianVersion = '1.1.10.Final' arquillianSpockVersion = '1.0.0.Beta3' - jrubyVersion = '9.3.8.0' + jrubyVersion = '9.3.4.0' pdfboxVersion = '1.8.16' junitVersion = '4.13.2' hamcrestVersion = '2.2'