propane 3.10.0-java → 3.11.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 412793f807afe7defb88f5a8376cf15de48e65f79ff2758d8fa9c4c1a0eb0202
-  data.tar.gz: a6a387f0a7e4db3b6a7048f35f1f4d5006734fe6a37a021918bd81850c37eedc
+  metadata.gz: 0d5ef355d6c1809f15dca038d16d0bc0e258c600758cb97fe8ff9e3234380d6f
+  data.tar.gz: e1ad523e3339a8e6430ccd2aa83387f42139eb8cf54488eff804b2cf3c33f8a7
 SHA512:
-  metadata.gz: e229c8b432547844db7d625fdfeff7551300fb8319bc485aa99a6bdcb723d364d0eb2bd20673a68dba5f8433e6f897d2e204f34f1028430b986b45967cdf48ec
-  data.tar.gz: 47864625dcf2cfd9cdfbce74cbd4ac2b470c97482e90f119dc235027557afe80b3302f150a097a2027a119a546ff29b0017bf6d4426178b2e966b4f21d360c6e
+  metadata.gz: cee42549f1c66a63c81e07836fa17b097be4f11140e0569f8c2f87f36a717aa31df99ad21b943c870fe76218a376d59bf5df9f3daef4ae451754b80fdb7d746b
+  data.tar.gz: 7ef32ce991b5f42e3e1fc09e459eb96a84da38eb373f8b3a5592ea7ccd6f974c8b566f6ccc0645d32f997a1cf7ac763e97ef4822c620bcf23ddadce0abdee6f0

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**v3.11.0** Suggest use of JRuby-9.3.1.0+, some refactoring of GfxRender and ShapeRender. Change `declared_field` to field possible since JRuby-9.3.0.0, required since JRuby-9.3.1.0
+
 **v3.10.0** Default to using FastNoise module, with alternative of SmoothNoise module.
 
 **v3.8.0** Refactor noise to delegate pattern, improve default implementation and add simplex noise option

data/README.md

@@ -1,17 +1,17 @@
 # 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)
 
-This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up.
+This version is intended to work with openjdk11+.
 
-A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. 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. Currently JavaFX is unsupported again @sampottinger is currently working on [vanilla processing][vanilla] to use OpenJFX. It would be nice make use of java modules, but I think we should let jruby project do that first (unless processing.org beat them to it).
+A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. 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. Currently JavaFX is unsupported. Using maven to create an automatic module, to be refined.
 
 adjust above for your OS/distro setup.
 
 ## Requirements
 
-Previously there has been linker issue with P2D or P3D sketches with stock openjdk with some linux distros, but that seems to have gone away. [Adopt open jdk binaries][adopt] have always worked.
+Tested with OpenJDK11 and OpenJDK17.
 
-- `jdk-11.0.7+`
-- `jruby-9.2.17.0`
+- `jdk-11.0.11+`
+- `jruby-9.3.1.0`
 
 ## Building and testing
 
@@ -25,10 +25,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.10.0-java.gem # local install
+jgem install propane-3.11.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.10.0-java.gem # local install
+jruby -S gem install propane-3.11.0-java.gem # local install
 ```
 
 ## Check Install

data/lib/propane/app.rb

@@ -11,10 +11,8 @@ module Propane
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
   # import custom Vecmath renderers
-  module Render
-    java_import 'monkstone.vecmath.GfxRender'
-    java_import 'monkstone.vecmath.ShapeRender'
-  end
+  java_import 'monkstone.vecmath.GfxRender'
+  java_import 'monkstone.vecmath.ShapeRender'
 
   # module NoiseModule
   #   java_import 'monkstone.noise.NoiseMode'
@@ -58,7 +56,6 @@ module Propane
     include HelperMethods
     include Math
     include MathTool
-    include Render
     include FastNoise
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse

data/lib/propane/helper_methods.rb

@@ -116,14 +116,14 @@ module Propane
     # some methods. Add to this list as needed.
     def proxy_java_fields
       fields = %w[key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
+      methods = fields.map { |field| java_class.field(field) }
+      @jfields = Hash[fields.zip(methods)]
     end
 
     # Fix java conversion problems getting the last key
     # If it's ASCII, return the character, otherwise the integer
     def key
-      int = @declared_fields['key'].value(java_self)
+      int = @jfields['key'].value(java_self)
       int < 256 ? int.chr : int
     end
 
@@ -160,19 +160,19 @@ module Propane
 
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
-      return @declared_fields['frameRate'].value(java_self) unless fps
+      return @jfields['frameRate'].value(java_self) unless fps
 
       super(fps)
     end
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      @declared_fields['mousePressed'].value(java_self)
+      @jfields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
     def key_pressed?
-      @declared_fields['keyPressed'].value(java_self)
+      @jfields['keyPressed'].value(java_self)
     end
 
     private

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Propane
-  VERSION = '3.10.0'
+  VERSION = '3.11.0'
 end

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.10.0'
+  id 'propane:propane:3.11.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -44,11 +44,12 @@ project 'propane', 'https://github.com/monkstone/propane' do
       'polyglot.dump.pom' => 'pom.xml',
       'project.build.sourceEncoding' => 'utf-8',
       'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
+      'jruby.version' => '9.3.1.0',
       'batik.version' => '1.14',
       'itextpdf.version' => '5.5.13.2',
       'jruby.api' => 'http://jruby.org/apidocs/')
 
-      pom 'org.jruby:jruby:9.2.17.0'
+      jar 'org.jruby:jruby-base:${jruby.version}'
       jar 'org.apache.xmlgraphics:batik-all:${batik.version}'
       jar 'com.itextpdf:itextpdf:${itextpdf.version}'
       jar 'org.processing:video:3.3.7' # only for compiling
@@ -94,16 +95,15 @@ project 'propane', 'https://github.com/monkstone/propane' do
                   build do
                     resource do
                       directory '${source.directory}/main/java'
-                      includes '**/**/*.glsl', '**/*.jnilib'
+                      includes '**/*.jnilib'
                       excludes '**/**/*.java'
                     end
                     resource do
                       directory '${source.directory}/main/resources'
-                      includes '**/*.png', '*.txt'
-                      excludes
+                      includes '**/*.png', '**/*.glsl', '**/*.txt'
                     end
                   end
                 end
                 reporting do
-                  plugin('org.apache.maven.plugins:maven-jxr-plugin:2.3')                  
+                  plugin('org.apache.maven.plugins:maven-jxr-plugin:2.3')
                 end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.10.0</version>
+  <version>3.11.0</version>
   <name>propane</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>https://github.com/monkstone/propane</url>
@@ -66,6 +66,7 @@ DO NOT MODIFY - GENERATED CODE
     <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
+    <jruby.version>9.3.1.0</jruby.version>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
@@ -75,9 +76,8 @@ DO NOT MODIFY - GENERATED CODE
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
-      <artifactId>jruby</artifactId>
-      <version>9.2.17.0</version>
-      <type>pom</type>
+      <artifactId>jruby-base</artifactId>
+      <version>${jruby.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
@@ -110,7 +110,6 @@ DO NOT MODIFY - GENERATED CODE
       <resource>
         <directory>${source.directory}/main/java</directory>
         <includes>
-          <include>**/**/*.glsl</include>
           <include>**/*.jnilib</include>
         </includes>
         <excludes>
@@ -121,7 +120,8 @@ DO NOT MODIFY - GENERATED CODE
         <directory>${source.directory}/main/resources</directory>
         <includes>
           <include>**/*.png</include>
-          <include>*.txt</include>
+          <include>**/*.glsl</include>
+          <include>**/*.txt</include>
         </includes>
       </resource>
     </resources>

data/propane.gemspec

@@ -31,11 +31,11 @@ Gem::Specification.new do |gem|
   gem.files << 'library/svg/batik-all-1.14.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_development_dependency 'jruby-openssl', '~> 0.10', '>=0.10.5'
+  gem.add_development_dependency 'jruby-openssl', '~> 0.10', '>=0.10.7'
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_runtime_dependency 'rake', '~> 13.0'
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.2'
+  gem.add_runtime_dependency 'arcball', '~> 1.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime >= 11.0.2+'
+  gem.requirements << 'java runtime >= 11.0.11+'
 end