Merge branch 'master' into compatibility

Author: monkstone

.mvn/extensions.xml

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

CHANGELOG.md

@@ -8,7 +8,7 @@
 
 **v2.6.6** Using a modified processing-core to support jdk9 (NB FX2D and sketches with control_panel using sliders are still expected to fail with jdk9). Jdk8 users should not notice any change.
 
-**v2.6.5** bump for processing-3.3.7
+**v2.6.5** bump for processing-3.4
 
 **v2.6.4** Vec2D and Vec3D now support `copy` constructor where the original can be a duck-type. Further the only requirement is that the duck-type responds to `:x`, and `:y` by returning a `float` or `fixnum` thus Vec2D can be promoted to Vec3D (where `z = 0`), or more usually some other Vector or Point class can be used as the original. A VectorUtils library has been implemented, see examples for usage.
 

README.md

@@ -1,7 +1,7 @@
 # Propane
 To build custom core see [processing-core][processing-core]
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.7, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`, (_runSketch not currently usable with jruby and jdk 9_). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. NB: this is a far from perfect solution and javafx sketches and possibly a feew others still fail to run with jdk9, but a least I get to diagnose those errors too.
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.4, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`, (_runSketch not currently usable with jruby and jdk 9_). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. NB: this is a far from perfect solution and javafx sketches and possibly a feew others still fail to run with jdk9, but a least I get to diagnose those errors too.
 
 adjust above for your OS/distro setup.
 

library/slider/slider.rb

@@ -5,6 +5,7 @@
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'
 
+# Slider module
 module Slider
   def self.slider(app:, x:, y:, name:, **opts)
     options = default.merge opts
@@ -35,7 +36,7 @@ def self.slider(app:, x:, y:, name:, **opts)
     end
     slider
   end
-  
+
   def self.default
     { length: 100, range: (0..100) }
   end

pom.rb

@@ -38,8 +38,8 @@
     'jogl.version' => '2.3.2'
     )
 
-  pom 'org.jruby:jruby:9.1.16.0'
-  jar 'com.apple.eawt:apple:1.0'
+  pom 'org.jruby:jruby:9.2.0.0'
+  jar 'org.processing:core:3.3.7'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
@@ -92,7 +92,7 @@
       )
     end
 
-    plugin( :compiler, '3.7.0',
+    plugin( :compiler, '3.8.0',
       source: '${maven.compiler.source}',
       target: '${maven.compiler.target}'
     )

pom.xml

@@ -83,7 +83,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.16.0</version>
+      <version>9.2.0.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -194,7 +194,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
+          <version>3.8.0</version>
           <configuration>
             <source>${maven.compiler.source}</source>
             <target>${maven.compiler.target}</target>

propane.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.description  = <<-EOS
   A batteries included version of processing in ruby, for MacOS and linux64.
   EOS
-  gem.summary       = %q{ruby wrapper for processing-3.3.7 on MacOS and linux64 bit only for opengl}
+  gem.summary       = %q{ruby wrapper for processing-3.4 on MacOS and linux64 bit only for opengl}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane-2.9.0.jar'