Bump asciidoctor-pdf to 1.5.0-alpha.14
MODIFY
asciidoctorj-core/build.gradle
asciidoctorj-core/build.gradle
@@ -24,7 +24,7 @@ def gemFiles = fileTree(jruby.gemInstallDir) {
include "gems/asciidoctor-${asciidoctorGemVersion}/data/**"
}
-jrubyPrepareGems << {
+jrubyPrepare << {
copy { // bundles the gems inside this artifact
from gemFiles
eachFile {

MODIFY
asciidoctorj-diagram/build.gradle
asciidoctorj-diagram/build.gradle
@@ -13,7 +13,7 @@ def gemFiles = fileTree(jruby.gemInstallDir) {
include "gems/asciidoctor-diagram-${asciidoctorDiagramGemVersion}/data/**"
}
-jrubyPrepareGems << {
+jrubyPrepare << {
copy { // bundles the gems inside this artifact
from gemFiles
into sourceSets.main.output.resourcesDir

MODIFY
asciidoctorj-distribution/build.gradle
asciidoctorj-distribution/build.gradle
@@ -9,6 +9,8 @@ dependencies {
compile project(':asciidoctorj-diagram')
compile project(':asciidoctorj-epub3')
compile project(':asciidoctorj-pdf')
+
+ compile 'org.jruby:jruby-complete:9.1.8.0'
}
jar.enabled = false

MODIFY
asciidoctorj-epub3/build.gradle
asciidoctorj-epub3/build.gradle
@@ -13,7 +13,7 @@ def gemFiles = fileTree(jruby.gemInstallDir) {
include 'gems/*/data/**'
}
-jrubyPrepareGems << {
+jrubyPrepare << {
copy { // bundles the gems inside this artifact
from gemFiles
into sourceSets.main.output.resourcesDir

MODIFY
asciidoctorj-pdf/build.gradle
asciidoctorj-pdf/build.gradle
+
+ext {
+ jrubyVersion = '9.1.8.0'
+}
+
dependencies {
- compile project(':asciidoctorj')
+ compile(project(':asciidoctorj')) {
+ exclude module: 'jruby-complete'
+ }
+
+ compile "org.jruby:jruby-complete:$jrubyVersion"
+
+
gems("rubygems:asciidoctor-pdf:$asciidoctorPdfGemVersion") {
// Exclude gems provided by AsciidoctorJ core
exclude module: 'asciidoctor'
@@ -32,7 +43,14 @@ def gemFiles = fileTree(jruby.gemInstallDir) {
exclude 'gems/rouge-*/lib/rouge/demos/**'
}
-jrubyPrepareGems << {
+jruby {
+ defaultRepositories = false
+ defaultVersion = jrubyVersion
+ execVersion = jrubyVersion
+ // TODO I'd like to be able to customize the name of the gemInstallDir
+}
+
+jrubyPrepare << {
copy { // bundles the gems inside this artifact
from gemFiles
into sourceSets.main.output.resourcesDir

MODIFY
asciidoctorj-pdf/gradle.properties
asciidoctorj-pdf/gradle.properties
properName=AsciidoctorJ PDF
description=AsciidoctorJ PDF bundles the Asciidoctor PDF RubyGem (asciidoctor-pdf) so it can be loaded into the JVM using JRuby.
-version=1.5.0-alpha.11
+version=1.5.0-alpha.14
gem_name=asciidoctor-pdf

MODIFY
build.gradle
build.gradle
@@ -12,12 +12,15 @@ buildscript {
}
}
dependencies {
- classpath "com.github.jruby-gradle:jruby-gradle-plugin:0.1.17"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7"
classpath "gradle.plugin.io.sdkman:gradle-sdkvendor-plugin:1.1.0"
}
}
+plugins {
+ id 'com.github.jruby-gradle.base' version '1.4.0'
+}
+
// TIP use -PpublishRelease=true to active release behavior regardless of the version
status = project.hasProperty('publishRelease') && project.publishRelease.toBoolean() ?
'release' : ((version == 'unspecified' || version.endsWith('-SNAPSHOT')) ? 'snapshot' : 'release')
@@ -53,8 +56,8 @@ ext {
erubisGemVersion = '2.7.0'
hamlGemVersion = '4.0.5'
openUriCachedGemVersion = '0.0.5'
- prawnGemVersion = '1.3.0'
- rougeGemVersion = '1.10.1'
+ prawnGemVersion = '2.1.0'
+ rougeGemVersion = '1.11.1'
slimGemVersion = '3.0.6'
threadSafeGemVersion = '0.3.5'
tiltGemVersion = '2.0.1'
@@ -136,7 +139,6 @@ subprojects {
configure(subprojects.findAll { !it.isDistribution() }) {
apply plugin: 'com.github.jruby-gradle.base'
- apply from: rootProject.file('gradle/eclipse.gradle')
apply from: rootProject.file('gradle/versioncheck.gradle')
repositories {
@@ -183,5 +185,5 @@ configure(subprojects.findAll { !it.isDistribution() }) {
// QUESTION is this the right place to insert this task dependency in the lifecycle?
// IMPORTANT The TMP or TEMP environment variable must be set for the gem install command to work on Windows
- processResources.dependsOn jrubyPrepareGems
+ processResources.dependsOn jrubyPrepare
}

DELETE
gradle/eclipse.gradle
-apply plugin: 'eclipse'
-
-tasks.eclipse.dependsOn jrubyPrepareGems
-eclipse {
- classpath {
- defaultOutputDir = file('build/eclipse')
- file {
- beforeMerged { classpath ->
- // remove old output entries, if present
- classpath.entries.removeAll { it.kind == 'output' }
- }
- withXml {
- // add gems to classpath
- asNode().appendNode('classpathentry', [kind: 'lib', path: 'build/vendor'])
- }
- }
- }
-}

Bump asciidoctor-pdf to 1.5.0-alpha.14