Refactor GfxRenderer and ShapeRenderer

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,5 @@
+**v4.0.0** Require use of jdk17 update to min JRuby-3.2.0.0
+
 **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.

lib/propane/app.rb

@@ -11,8 +11,8 @@ module Propane
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
   # import custom Vecmath renderers
-  java_import 'monkstone.vecmath.GfxRender'
-  java_import 'monkstone.vecmath.ShapeRender'
+  import 'monkstone.vecmath.GfxRender'
+  import 'monkstone.vecmath.ShapeRender'
 
   # module NoiseModule
   #   java_import 'monkstone.noise.NoiseMode'

lib/propane/version.rb

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

pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.11.0'
+  id 'propane:propane:4.0.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -44,7 +44,7 @@
       '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',
+      'jruby.version' => '9.3.2.0',
       'batik.version' => '1.14',
       'itextpdf.version' => '5.5.13.2',
       'jruby.api' => 'http://jruby.org/apidocs/')

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.11.0</version>
+  <version>4.0.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,7 +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.version>9.3.2.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>

propane.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'arcball', '~> 1.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime >= 11.0.11+'
+  gem.requirements << 'java runtime >= 17.0.1+'
 end

src/main/java/processing/core/PApplet.java

@@ -3,7 +3,7 @@
  /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2012-20 The Processing Foundation
+  Copyright (c) 2012-22 The Processing Foundation
   Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
@@ -2118,7 +2118,7 @@ protected PGraphics makeGraphics(int w, int h,
     /**
      * Create default renderer, likely to be resized, but needed for surface
      * init.
-     * @return 
+     * @return
      */
     protected PGraphics createPrimaryGraphics() {
         return makeGraphics(sketchWidth(), sketchHeight(),
@@ -2146,7 +2146,7 @@ protected PGraphics createPrimaryGraphics() {
      * to the parent PApplet is included, which makes save() work without
      * needing an absolute path.
      *
-     * @return 
+     * @return
      * @webref image
      * @param w width in pixels
      * @param h height in pixels
@@ -3224,7 +3224,7 @@ the file executable before attempting to open it (chmod +x).
      *
      * ( end auto-generated )
      *
-     * @return 
+     * @return
      * @webref input:files
      * @param args arguments to the launcher, eg. a filename.
      * @usage Application