Merge pull request #24 from ruby-processing/jdk9

Jdk9

Author: monkstone

.travis.yml

@@ -1,3 +1,5 @@
+**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.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.

CHANGELOG.md

@@ -1,21 +1,16 @@
 # Propane
-[![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane) [![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)](https://travis-ci.org/ruby-processing/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 processing core (from a local maven repository and opengl etc from maven central). 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].
+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()` replaces `protected runSketch()`, not currently useable 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 some sketches still fail to run with jdk9, but a least I get to diagnose those errors too.
 
-NB: The main reason for build failing is when the `core.jar` is not available from maven central, to install a local jar (_example for linux mint_):-
-```bash
-
-mvn install:install-file /home/tux/processing-3.3.7/core/library/core.jar -DgroupId=org.processing -DartifactId=core -Dversion=3.3.7
-```
 adjust above for your OS/distro setup.
 
 ## Requirements
 
-- jdk8+
+- jdk8+ (jdk9 mostly works, see changelog, but is noisy)
 - jruby-9.1.16.0
 - mvn-3.5.0+
-- core.jar processing-3.3.7 (_build only_)
+- processing-core.jar (_build only_) not generally available
 
 ## Building and testing
 
@@ -28,7 +23,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.6.4-java.gem # for local install
+jgem install propane-2.6.6-java.gem # local install requires a custom processing-core
 ```
 
 ## Usage
@@ -86,3 +81,5 @@ propane --install samples
 
 [building]:http://ruby-processing.github.io/building/building/
 [gh-pages]:https://ruby-processing.github.io/propane/
+[processing-core]:https://github.com/ruby-processing/processing-core
+

README.md

@@ -7,7 +7,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: core-3.3.7.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
+    f.puts('Class-Path: processing-core.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 

Rakefile

@@ -118,7 +118,7 @@ def initialize(options = {}, arguments = [])
       Propane.app = self
       @arguments = arguments
       @options   = options
-      run_sketch
+      run_propane
     end
 
     def size(*args)

lib/propane/app.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.6.4'.freeze
+  VERSION = '2.6.6'.freeze
 end

lib/propane/version.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.6.5'
+  id 'propane:propane', '2.6.6'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -42,13 +42,7 @@
     plugin :resources, '2.6'
     plugin :dependency, '2.10' do
       execute_goals( id: 'default-cli',
-        artifactItems: [ { groupId:  'org.processing',
-          artifactId:  'core',
-          version:  '3.3.7',
-          type:  'jar',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.jogl',
+        artifactItems: [ { groupId:  'org.jogamp.jogl',
           artifactId:  'jogl-all',
           version:  '${jogl.version}',
           type:  'jar',

pom.rb

@@ -100,13 +100,6 @@ DO NOT MODIFIY - GENERATED CODE
               <id>default-cli</id>
               <configuration>
                 <artifactItems>
-                  <artifactItem>
-                    <groupId>org.processing</groupId>
-                    <artifactId>core</artifactId>
-                    <version>3.3.7</version>
-                    <type>jar</type>
-                    <outputDirectory>${propane.basedir}/lib</outputDirectory>
-                  </artifactItem>
                   <artifactItem>
                     <groupId>org.jogamp.jogl</groupId>
                     <artifactId>jogl-all</artifactId>

pom.xml

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-3.3.7.jar'
+  gem.files << 'lib/processing-core.jar'
   gem.files << 'lib/gluegen-rt-2.3.2.jar'
   gem.files << 'lib/jogl-all-2.3.2.jar'
   gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'