Getting ready for JRuby-9.3.1.0

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,5 @@
+**v2.6.0** Recommend JRuby-9.3.1.0 use, move non-java files to resources (simplifies path). Use `field` not `declared_field` to access java_class fields.
+
 **v2.5.1** Recommend JRuby-9.2.19.0 use.
 
 **v2.5.0** Refactor noise to delegate pattern and make OpenSimplex2 noise default noise, implement pdf and svg export libraries.

lib/jruby_art/helper_methods.rb

@@ -123,14 +123,14 @@ def find_method(method_name)
     # 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
 
@@ -167,19 +167,19 @@ def save_strings(filename, strings)
 
     # 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

lib/jruby_art/version.rb

@@ -2,5 +2,5 @@
 
 # A wrapper for version
 module JRubyArt
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

pom.rb

@@ -1,7 +1,7 @@
 project 'jruby_art', 'https://github.com/ruby-processing/JRubyArt' do
 
   model_version '4.0.0'
-  id 'ruby-processing:jruby_art:2.5.1'
+  id 'ruby-processing:jruby_art:2.6.0'
   packaging 'jar'
 
   description 'Jar for JRubyArt'
@@ -28,11 +28,12 @@
               'polyglot.dump.pom' => 'pom.xml',
               'project.build.sourceEncoding' => 'UTF-8',
               'jogl.version' => '2.3.2',
+              'jruby.version' => '9.3.1.0',
               'itextpdf.version' => '5.5.13.2',
               'batik.version' => '1.14',
               'jruby.api' => 'http://jruby.org/apidocs/' )
 
-  pom 'org.jruby:jruby:9.2.19.0'
+  jar 'org.jruby:jruby-base:${jruby.version}'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
@@ -76,12 +77,11 @@
   build do
     resource do
       directory '${source.directory}/main/java'
-      includes '**/**/*.glsl', '**/*.jnilib'
       excludes '**/**/*.java'
     end
     resource do
       directory '${source.directory}/main/resources'
-      includes '**/*.png', '*.txt'
+      includes '**/*.png', '**/*.txt', '**/*.glsl'
     end
   end
 

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>jruby_art</artifactId>
-  <version>2.5.1</version>
+  <version>2.6.0</version>
   <name>jruby_art</name>
   <description>Jar for JRubyArt</description>
   <url>https://github.com/ruby-processing/JRubyArt</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>
     <jruby_art.basedir>${project.basedir}</jruby_art.basedir>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
@@ -75,9 +76,8 @@ DO NOT MODIFY - GENERATED CODE
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
-      <artifactId>jruby</artifactId>
-      <version>9.2.19.0</version>
-      <type>pom</type>
+      <artifactId>jruby-base</artifactId>
+      <version>${jruby.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>
@@ -109,10 +109,6 @@ DO NOT MODIFY - GENERATED CODE
     <resources>
       <resource>
         <directory>${source.directory}/main/java</directory>
-        <includes>
-          <include>**/**/*.glsl</include>
-          <include>**/*.jnilib</include>
-        </includes>
         <excludes>
           <exclude>**/**/*.java</exclude>
         </excludes>
@@ -121,7 +117,8 @@ DO NOT MODIFY - GENERATED CODE
         <directory>${source.directory}/main/resources</directory>
         <includes>
           <include>**/*.png</include>
-          <include>*.txt</include>
+          <include>**/*.txt</include>
+          <include>**/*.glsl</include>
         </includes>
       </resource>
     </resources>

vendors/Rakefile

@@ -11,7 +11,7 @@ WARNING = <<~WARN
 
 WARN
 # https://github.com/processing/processing-video/releases/download/r6-v2.0-beta4/video-2.0-beta4.zip
-JRUBYC_VERSION = '9.2.19.0'
+JRUBYC_VERSION = '9.3.1.0'
 SOUND = 'sound.zip'
 SOUND_VERSION = 'v2.2.3'
 VIDEO = 'video.zip'