Merge branch 'jdk17'

Author: monkstone

.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>

Rakefile

@@ -17,7 +17,7 @@ end
 
 desc 'Install'
 task :install do
-  sh 'mvn dependency:copy'
+  sh './mvnw dependency:copy'
   FileUtils.mv("target/propane-#{Propane::VERSION}.jar", 'lib')
 end
 

propane.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   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.7'
-  gem.add_development_dependency 'minitest', '~> 5.14'
+  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']

src/main/java/monkstone/vecmath/vec2/Vec2.java

@@ -21,6 +21,7 @@
 *
 * fastAtan2 algorithm from https://github.com/libgdx/libgdx (Apache 2.0 license)
  */
+import java.util.logging.Logger;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -227,16 +228,24 @@ public IRubyObject dist(ThreadContext context, IRubyObject other) {
         double result = Math.hypot(jx - b.jx, jy - b.jy);
         return runtime.newFloat(result);
     }
+    
+    @Deprecated
+    @JRubyMethod(name = "cross", required = 1)
+    public IRubyObject cross(ThreadContext context, IRubyObject other) {
+        Logger log = Logger.getGlobal();
+        log.warning("prefer ^ operator");
+        return op_wedge(context, other);
+    }
 
     /**
      *
      * @param context ThreadContext
      * @param other IRubyObject
-     * @return cross product IRubyObject
+     * @return wedge product IRubyObject
      */
-    @JRubyMethod(name = "cross", required = 1)
+    @JRubyMethod(name = "^", required = 1)
 
-    public IRubyObject cross(ThreadContext context, IRubyObject other) {
+    public IRubyObject op_wedge(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
         if (other instanceof Vec2) {

src/main/java/processing/awt/PGraphicsJava2D.java

@@ -31,7 +31,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-
 import processing.core.*;
 
 

src/main/java/processing/awt/PImageAWT.java

@@ -35,7 +35,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
-
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageTypeSpecifier;
@@ -44,7 +43,6 @@
 import javax.imageio.metadata.IIOInvalidTreeException;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataNode;
-
 import processing.core.PApplet;
 import processing.core.PImage;
 
@@ -108,8 +106,8 @@ public PImageAWT(Image img) {
 
   /**
    * Use the getNative() method instead, which allows library interfaces to be
-   * written in a cross-platform fashion for desktop, Android, and others.
-   * This is still included for PGraphics objects, which may need the image.
+   * written in a cross-platform fashion for desktop, Android, and others.This is still included for PGraphics objects, which may need the image.
+   * @return
    */
   public Image getImage() {  // ignore
     return (Image) getNative();