bump versions use jdk11

Author: monkstone

.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.3</version>
   </extension>
 </extensions>

CHANGELOG.md

@@ -1,9 +1,11 @@
+**v1.3.0** Bump for janino-3.1.2, and jdk11
+
 **v1.2.0** Bump for janino-3.0.12, plus some refactoring
 
 **v1.1.3** Bump for processing-3.3.4
 
 **v1.1.2** Use sunflow.util.FloatList and IntList, netbeans profiling suggest it is worth doing (there is a vanilla processing alternative, with a different interface)  
 
-**v1.1.1** Left out GLASS from fill type switch easily fixed thought
+**v1.1.1** Left out GLASS from fill type switch easily fixed though
 
-**v1.1.0** I'm conflicted about versioning here, this a later version than Joon Hyub Lee joonsrenderer. What is different is sunflow is integrated and updated (switch on String, try with resources etc, and importantly updated janino). I hava also hacked joons renderer a bit as well.
+**v1.1.0** I'm conflicted about versioning here, this a later version than Joon Hyub Lee joonsrenderer. What is different is sunflow is integrated and updated (switch on String, try with resources etc, and importantly updated janino). I have also hacked joons renderer a bit as well.

Rakefile

@@ -6,7 +6,7 @@ def create_manifest
   file = File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: janino-3.0.12.jar commons-compiler-3.0.12.jar')
+    f.puts('Class-Path: janino-3.1.2.jar commons-compiler-3.1.2.jar')
   end
 end
 

joonsrenderer.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://ruby-processing.github.io/joonsrenderer/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/joonsrenderer.jar'
-  gem.files << 'lib/janino-3.0.12.jar'
-  gem.files << 'lib/commons-compiler-3.0.12.jar'
+  gem.files << 'lib/janino-3.1.2.jar'
+  gem.files << 'lib/commons-compiler-3.1.2.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']

lib/commons.compiler/module-info.class

@@ -0,0 +1,7 @@
+module commons.compiler {
+    exports org.codehaus.commons.compiler;
+    exports org.codehaus.commons.compiler.samples;
+    exports org.codehaus.commons.compiler.util;
+    exports org.codehaus.commons.nullanalysis;
+
+}

lib/commons.compiler/module-info.java

@@ -0,0 +1,5 @@
+module  janino{
+    requires commons.compiler;
+    exports org.codehaus.janino;
+
+}

lib/janino/module-info.class

@@ -1,3 +1,3 @@
 module JoonsRenderer
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

lib/janino/module-info.java

@@ -2,7 +2,7 @@
 project 'joonsrenderer' do
 
   model_version '4.0.0'
-  id 'joons:joonsrenderer:1.2.0'
+  id 'joons:joonsrenderer:1.3.0'
   packaging 'jar'
   description 'joonsrenderer for propane and JRubyArt'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -21,7 +21,7 @@
   'maven.compiler.source' => '1.8',
   'project.build.sourceEncoding' => 'utf-8',
   'maven.compiler.target' => '1.8',
-  'janino.version' => '3.0.12',
+  'janino.version' => '3.1.2',
   'jogl.version' => '2.3.2',
   'processing.version' => '3.3.7'
   )
@@ -33,8 +33,8 @@
   jar('org.codehaus.janino:janino:${janino.version}')
 
   overrides do
-    plugin :resources, '2.6'
-    plugin :dependency, '2.10' do
+    plugin :resources, '3.1.0'
+    plugin :dependency, '3.1.2' do
       execute_goals( id: 'default-cli',
         artifactItems:[
         { groupId: 'org.codehaus.janino',
@@ -52,24 +52,24 @@
       ]
       )
     end
-
-    plugin( :compiler, '3.8.0',
-    source: '${maven.compiler.source}',
-    target: '${maven.compiler.target}'
-    )
-    plugin( :javadoc, '2.10.4',
-    detect_offline_links:  'false',
-    )
-    plugin( :jar, '3.0.2',
-    'archive' => {
-      'manifestFile' =>  'MANIFEST.MF'
-    }
-    )
+    plugin(:compiler, '3.8.1',
+           'release' => '11')
+    plugin(:javadoc, '2.10.4',
+           'detectOfflineLinks' => 'false',
+           'links' => ['${processing.api}',
+                       '${jruby.api}'])
+    plugin(:jar, '3.2.0',
+      'archive' => {
+        'manifestFile' =>  'MANIFEST.MF'
+      })
+    plugin :jdeps, '3.1.2' do
+      execute_goals 'jdkinternals', 'test-jdkinternals'
+    end
   end
 
   build do
     default_goal 'package'
-    source_directory 'src'
+    source_directory '${source.directory}/main/java'
     final_name 'joonsrenderer'
   end
 end