Skip to content

Commit

Permalink
Merge pull request #91 from robertpanzer/upgrade-2.3.6
Browse files Browse the repository at this point in the history
Upgrade to asciidoctor-pdf 2.3.6 & Gradle 8.0.2
  • Loading branch information
robertpanzer committed Apr 9, 2023
2 parents 2a66b06 + 3e19338 commit 8fd9ed0
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion asciidoctorj-pdf/gradle.properties
Original file line number Diff line number Diff line change
@@ -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.5
version=2.3.6
gem_name=asciidoctor-pdf
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ ext {
arquillianVersion = '1.1.10.Final'
arquillianSpockVersion = '1.0.0.Beta3'
jrubyVersion = '9.4.0.0'
pdfboxVersion = '1.8.16'
pdfboxVersion = '1.8.17'
junitVersion = '4.13.2'
hamcrestVersion = '2.2'

// gem versions
asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.7'
asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.5'
asciidoctorPdfGemVersion = project.hasProperty('asciidoctorPdfGemVersion') ? project.asciidoctorPdfGemVersion : '2.3.6'

addressableVersion = '2.8.0'
concurrentRubyVersion = '1.1.7'
Expand Down Expand Up @@ -72,8 +72,8 @@ subprojects {
// Must redefine here to work around a bug in the Eclipse plugin
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8

plugins.withType(JavaPlugin) {
project.tasks.withType(JavaCompile) { task ->
plugins.withType(JavaPlugin).configureEach {
project.tasks.withType(JavaCompile).configureEach { task ->
if (JavaVersion.current().isJava11Compatible()) {
task.options.release = 8
}
Expand All @@ -84,7 +84,7 @@ subprojects {
options.compilerArgs << "-Xlint:unchecked"
}
}
project.tasks.withType(GroovyCompile) { task ->
project.tasks.withType(GroovyCompile).configureEach { task ->
if (JavaVersion.current().isJava11Compatible()) {
task.options.release = 8
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=2.3.5
version=2.3.6
sourceCompatibility=1.8
targetCompatibility=1.8
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
2 changes: 1 addition & 1 deletion itest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies {

jar.enabled = false

configurations.all {
configurations.configureEach {
artifacts.clear()
}

0 comments on commit 8fd9ed0

Please sign in to comment.