Compile with JDK9

* updated groovy to a java 9 compatible version * fixed classpath issues in tests Closes asciidoctor#591
tisoft · Jan 10, 2018 · 7e59136 · 7e59136
1 parent 75c3efb
commit 7e59136
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,6 @@ matrix:
     - jdk: oraclejdk8
     - jdk: oraclejdk7
     - jdk: openjdk7
-  allow_failures:
-    - jdk: oraclejdk9
 before_script: unset GEM_PATH GEM_HOME JRUBY_OPTS
 before_install:
   - sudo hostname "$(hostname | cut -c1-63)"

diff --git a/...torj-core/src/test/java/org/asciidoctor/extension/WhenRubyExtensionGroupIsRegistered.java b/...torj-core/src/test/java/org/asciidoctor/extension/WhenRubyExtensionGroupIsRegistered.java
@@ -29,7 +29,7 @@ public class WhenRubyExtensionGroupIsRegistered {
     public void ruby_extension_should_be_registered() {
 
         this.asciidoctor.createGroup()
-            .loadRubyClass(Class.class.getResourceAsStream("/YellRubyBlock.rb")).rubyBlock("rubyyell", "YellRubyBlock")
+            .loadRubyClass(getClass().getResourceAsStream("/YellRubyBlock.rb")).rubyBlock("rubyyell", "YellRubyBlock")
             .register();
 
         String content = asciidoctor.renderFile(
@@ -47,7 +47,7 @@ public void ruby_extension_should_be_registered() {
     public void ruby_extension_should_be_unregistered() {
 
         ExtensionGroup extensionGroup = this.asciidoctor.createGroup()
-            .loadRubyClass(Class.class.getResourceAsStream("/YellRubyBlock.rb"))
+            .loadRubyClass(getClass().getResourceAsStream("/YellRubyBlock.rb"))
             .rubyBlock("rubyyell", "YellRubyBlock");
 
         {

diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/extension/WhenRubyExtensionIsRegistered.java b/asciidoctorj-core/src/test/java/org/asciidoctor/extension/WhenRubyExtensionIsRegistered.java
@@ -29,7 +29,7 @@ public class WhenRubyExtensionIsRegistered {
     public void ruby_extension_should_be_registered() {
 
         RubyExtensionRegistry rubyExtensionRegistry = this.asciidoctor.rubyExtensionRegistry();
-        rubyExtensionRegistry.loadClass(Class.class.getResourceAsStream("/YellRubyBlock.rb")).block("rubyyell", "YellRubyBlock");
+        rubyExtensionRegistry.loadClass(getClass().getResourceAsStream("/YellRubyBlock.rb")).block("rubyyell", "YellRubyBlock");
 
         String content = asciidoctor.renderFile(
                 classpath.getResource("sample-with-ruby-yell-block.ad"),

diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ ext {
   coderayGemVersion = '1.1.0'
 
   codenarcVersion = '0.24.1'
-  groovyVersion = '2.4.7'
+  groovyVersion = '2.4.13'
   erubisGemVersion = '2.7.0'
   hamlGemVersion = '4.0.5'
   openUriCachedGemVersion = '0.0.5'