propane 3.8.0-java → 4.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df47b4eba645e3b5de5e4c6bbcd5af6c2955cc2e34c326fcb712b967d272c2e
-  data.tar.gz: fd791b044c4780f082aa2f6660a7818266603fd6fdcbb6463c8af6c42e34a41d
+  metadata.gz: ed3ade00bcc8f690667cef5813b3f2313bbb172ee6c5e8f2fd596cd3e350c24f
+  data.tar.gz: ed0dd5d31432a47dd33e982de5f0243e89183832dd234778971825ccde0df624
 SHA512:
-  metadata.gz: 49bab01156deeea38dc4710486fa371dc93a0b0056f7e93d5110fc2343f4477093fcbd2cc50cc7d3153668916d80ed1dff74a0e3fdcce652784d0d6d8d99c90a
-  data.tar.gz: 752c53bb1719652fc1b11514add89b0dff33b2dba23b72ed44db0c58a3d86b99373d1f69f7d928c12e829fb4d1b942da89805d3d4dc3c427bcc36477d60abd75
+  metadata.gz: ddaaa9ea1c8fcfc60289e39de72f74df4e64285af3d6ee95f92c90d8eafc1f8f56715d40cf8f0ce92aa1e92cc2b69ec58eb06f9e884992c834e23468173bff96
+  data.tar.gz: f88e992e3f544e44da3f0d49387f16853912fafa2cb3285a790db360353c53fdfe33250baeac2a142875a086e93ac5ca065ddec08c6fa73585610900036a55d4

data/.mvn/extensions.xml

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

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/.travis.yml

@@ -2,7 +2,7 @@ language: java
 dist: bionic
 
 rvm:
-  - jruby-9.2.12.0
+  - jruby-9.2.17.0
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,6 +1,12 @@
+**v4.0.0** Requires use of jdk17 update to min JRuby-3.2.0.0, deprecates cross product for Vec2D in favor of wedge product.
+
+**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
 
-**v3.7.1** Recommend JRuby-9.2.15.0 use
+**v3.7.1** Recommend JRuby-9.2.16.0 use
 
 **v3.5.0** Rebase processing core code around Sam Pottingers latest fixes for JOGL an image save, does mean breaking some of Diwis and Joshua Davis examples, but one hopes codeanticode knows what he's doing.
 

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 OpenJDK17.
 
-- `jdk-11.0.7+`
-- `jruby-9.2.16.0`
+- `jdk-17.01+`
+- `jruby-9.3.2.0`
 
 ## Building and testing
 
@@ -25,10 +25,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.8.0-java.gem # local install
+jgem install propane-4.0.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.8.0-java.gem # local install
+jruby -S gem install propane-4.0.0-java.gem # local install
 ```
 
 ## Check Install

data/Rakefile

@@ -17,7 +17,8 @@ end
 
 desc 'Install'
 task :install do
-  sh "mv target/propane-#{Propane::VERSION}.jar lib"
+  sh './mvnw dependency:copy'
+  FileUtils.mv("target/propane-#{Propane::VERSION}.jar", 'lib')
 end
 
 desc 'Gem'
@@ -35,9 +36,9 @@ task :compile do
   sh './mvnw package'
 end
 
-desc 'JRuby-Complete'
-task :install_complete do
-  sh 'cd vendors && rake'
+desc 'pmd'
+task :pmd do
+  sh './mvnw pmd:pmd'
 end
 
 desc 'Test'
@@ -53,7 +54,7 @@ end
 desc 'clean'
 task :clean do
   Dir['./**/*.{jar,gem}'].each do |path|
-    puts "Deleting #{path} ..."
+    puts 'Deleting #{path} ...'
     File.delete(path)
   end
   FileUtils.rm_rf('./target')

data/lib/propane/app.rb

@@ -11,13 +11,12 @@ 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
+  import 'monkstone.vecmath.GfxRender'
+  import 'monkstone.vecmath.ShapeRender'
 
-  VALUE = Java::MonkstoneNoise::NoiseMode::PERLIN
-  SIMPLEX = Java::MonkstoneNoise::NoiseMode::SIMPLEX
+  # module NoiseModule
+  #   java_import 'monkstone.noise.NoiseMode'
+  # end
 
   # This class is the base class the user should inherit from when making
   # their own sketch.
@@ -57,7 +56,7 @@ module Propane
     include HelperMethods
     include Math
     include MathTool
-    include Render
+    include FastNoise
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
@@ -117,7 +116,7 @@ module Propane
 
     def initialize(options = {}, arguments = [])
       # Guard against invalid input.
-      proxy_java_fields
+      proxy_java_fields # see helper_methods
       raise TypeError unless options.is_a? Hash
       raise TypeError unless arguments.is_a? Array
 
@@ -156,19 +155,13 @@ module Propane
 
     def import_opengl
       # Include processing opengl classes that we'd like to use:
-      %w[FontTexture FrameBuffer LinePath LineStroker PGL
-         PGraphics2D PGraphics3D PGraphicsOpenGL PShader
-         PShapeOpenGL Texture].each do |klass|
+      %w[FontTexture FrameBuffer LinePath LineStroker PGL PGraphics2D
+         PGraphics3D PGraphicsOpenGL PJOGL PShader PSurfaceJOGL
+         VertexBuffer PShapeOpenGL Texture].each do |klass|
         java_import "processing.opengl.#{klass}"
       end
     end
 
-    def proxy_java_fields
-      fields = %w[sketchPath key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
-    end
-
     # When certain special methods get added to the sketch, we need to let
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:

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.8.0'
+  VERSION = '4.0.0'
 end

data/library/pdf/pdf.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Propane::App
+  require_relative 'itextpdf-5.5.13.2.jar'
+  java_import Java::ProcessingPdf::PGraphicsPDF
+end

data/library/slider/slider.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Here's a little library for quickly hooking up in sketch sliders.
-# Copyright (c) 2015-20 Martin Prout.
+# Copyright (c) 2015-22 Martin Prout.
 
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'

data/library/svg/svg.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Propane::App
+  require_relative 'batik-all-1.14.jar'
+  java_import Java::ProcessingSvg::PGraphicsSVG
+end

data/mvnw

@@ -212,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -246,7 +246,7 @@ else
         else
             curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
         fi
-        
+
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"

data/mvnw.cmd

@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
 FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.8.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,19 +44,43 @@ 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.2.0',
+      'batik.version' => '1.14',
+      'itextpdf.version' => '5.5.13.2',
       'jruby.api' => 'http://jruby.org/apidocs/')
 
-    pom 'org.jruby:jruby:9.2.16.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
       jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
       jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
 
       overrides do
-        plugin('org.codehaus.mojo:versions-maven-plugin:2.7',
+
+        plugin('org.codehaus.mojo:versions-maven-plugin:2.8.1',
           'generateBackupPoms' => 'false')
           plugin(:compiler, '3.8.1',
-            'release' => '11')
-            plugin(:javadoc, '3.2.0',
+            'release' => '17')
+            plugin :dependency, '3.2.0' do
+              execute_goals( id: 'default-cli',
+                artifactItems:[
+                  { groupId: 'com.itextpdf',
+                    artifactId: 'itextpdf',
+                    version: '${itextpdf.version}',
+                    type: 'jar',
+                    outputDirectory: '${propane.basedir}/library/pdf'
+                  },
+                  { groupId: 'org.apache.xmlgraphics',
+                    artifactId: 'batik-all',
+                    version: '${batik.version}',
+                    type: 'jar',
+                    outputDirectory: '${propane.basedir}/library/svg'
+                  }
+                ]
+              )
+            end
+            plugin(:javadoc, '3.3.1',
               'detectOfflineLinks' => 'false',
               'links' => ['${jruby.api}',
                 '${processing.api}'])
@@ -66,17 +90,20 @@ project 'propane', 'https://github.com/monkstone/propane' do
                       'Automatic-Module-Name' => 'processing.core'
                     }
                     })
+                    plugin('org.apache.maven.plugins:maven-pmd-plugin:3.15.0')
                   end
                   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:3.1.1')
+                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.8.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>
@@ -62,8 +62,11 @@ DO NOT MODIFY - GENERATED CODE
     <url>https://github.com/ruby-processing/propane/issues</url>
   </issueManagement>
   <properties>
+    <batik.version>1.14</batik.version>
+    <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.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>
@@ -73,9 +76,18 @@ DO NOT MODIFY - GENERATED CODE
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
-      <artifactId>jruby</artifactId>
-      <version>9.2.16.0</version>
-      <type>pom</type>
+      <artifactId>jruby-base</artifactId>
+      <version>${jruby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-all</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>${itextpdf.version}</version>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
@@ -98,7 +110,6 @@ DO NOT MODIFY - GENERATED CODE
       <resource>
         <directory>${source.directory}/main/java</directory>
         <includes>
-          <include>**/**/*.glsl</include>
           <include>**/*.jnilib</include>
         </includes>
         <excludes>
@@ -109,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>
@@ -118,7 +130,7 @@ DO NOT MODIFY - GENERATED CODE
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>versions-maven-plugin</artifactId>
-          <version>2.7</version>
+          <version>2.8.1</version>
           <configuration>
             <generateBackupPoms>false</generateBackupPoms>
           </configuration>
@@ -127,12 +139,39 @@ DO NOT MODIFY - GENERATED CODE
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.1</version>
           <configuration>
-            <release>11</release>
+            <release>17</release>
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
+          <artifactId>maven-dependency-plugin</artifactId>
           <version>3.2.0</version>
+          <executions>
+            <execution>
+              <id>default-cli</id>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>com.itextpdf</groupId>
+                    <artifactId>itextpdf</artifactId>
+                    <version>${itextpdf.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${propane.basedir}/library/pdf</outputDirectory>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>batik-all</artifactId>
+                    <version>${batik.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${propane.basedir}/library/svg</outputDirectory>
+                  </artifactItem>
+                </artifactItems>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.3.1</version>
           <configuration>
             <detectOfflineLinks>false</detectOfflineLinks>
             <links>
@@ -152,7 +191,19 @@ DO NOT MODIFY - GENERATED CODE
             </archive>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>3.15.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>3.1.1</version>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

data/propane.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |gem|
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w[GPL-3.0 LGPL-2.0]
   gem.description  = <<-EOS
-  A batteries included version of processing in ruby targetting jdk11.
+  A batteries included version of processing in ruby targetting jdk11+.
   EOS
-  gem.summary       = 'ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)'
+  gem.summary       = 'ruby implementation of processing-4.0 on linux and windows (64bit only), might work MacOS, needs testing'
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.files << "lib/propane-#{Propane::VERSION}.jar"
@@ -27,13 +27,15 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-natives-macosx-universal.jar'
 #  gem.files << 'lib/jogl-all-natives-ios-arm64.jar'
   gem.files << 'lib/jogl-all-natives-windows-amd64.jar'
+  gem.files << 'library/pdf/itextpdf-5.5.13.2.jar'
+  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.1.0', '>=0.1.3'
-  gem.add_development_dependency 'minitest', '~> 5.14'
-  gem.add_runtime_dependency 'rake', '~> 12.3'
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.2'
+  gem.add_development_dependency 'jruby-openssl', '~> 0.10', '>=0.10.7'
+  gem.add_development_dependency 'minitest', '~> 5.15'
+  gem.add_runtime_dependency 'rake', '~> 13.0'
+  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 >= 17.0.1+'
 end

data/src/main/java/monkstone/ColorUtil.java

@@ -3,7 +3,7 @@
  * in their sketches. Includes a method to efficiently convert an array of web
  * strings to an array of color int, and another to convert an array of color
  * int to a string that can be used in ruby code (to generate web color array).
- * Copyright (c) 2015-20 Martin Prout.
+ * Copyright (c) 2015-22 Martin Prout.
  * This utility is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or (at