propane 3.0.1.pre-java → 3.1.0.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef3d3bb06db328b5edfdb66a77c63c7698ffd06bf77d94a0f0efb313d6e030a
-  data.tar.gz: ec99108177b6771d29881b4962754026b7567b33b259b6c9eaa90719589ef04d
+  metadata.gz: d30b5c711105c3e4795739b48211591d221039464e60a9e1f545c7d43bcd0294
+  data.tar.gz: 7cced24e7cc4e1dc831837f8d263c8211f09dd2e265bf7d46a8362704d577ce8
 SHA512:
-  metadata.gz: 939d9b0ad433e0abc8857fc703f8d769298cc392373f5a2af3e75474e6cb19f969cc7d5fe401820a2f9cb6ff4be8a6c1cdc2b208c63e5b03b8ba140d111f55c1
-  data.tar.gz: 0f0bd83c83a6dc5450e9d24f9097aa90816ffebd731fe5c1f75f0286951960777aeac4df1087134c2c620846aa4ec311f990717cc7821745273ecadc7cc73696
+  metadata.gz: e3e297a0d7a8ce24c5543bb83eb69146be511d808fd6e6a2e2bbaf0dc84ed60cbde754b6b40c09c5354210d88a999da386f61165bdbeb91554817546b6516af6
+  data.tar.gz: 895be9e7ce50d9bba9d2433cc457265faaa3690199ea88815c52cb87c09fc7f1a17f86661defff1a1a41d3f76e81c01f7c9daead46dcdc8dac1a47943ea6a1a1

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v3.0.1.pre** Bump jriuby version
+**v3.1.0.pre** Now is the time for some serious refactoring for jdk11. Hell we might even get in working on MacOS and Windows, ahead of vanilla processing. For MacOS this means ditching apple.jar dependency.
+
+**v3.0.1.pre** Bump jruby version
 
 **v3.0.0.pre** Compiled for java 11, works on linux, requires testing on MacOS and Windows
 

data/README.md

@@ -1,5 +1,7 @@
 # Propane
-To build custom core see [processing-core][processing-core]
+
+Here is my attempt to get a version of ruby-processing working with openjdk11, it imore than a proof of concept, as it already works very succesfully under linux the question is will it work under Windows and MacOS. To do this I have created a custom maven build of processing core, to which I add vanilla processing jogl jars (these are not the same as jogl jars form maven).
+I am watching with interest progress made by @sampottinger on [vanilla processing][vanilla]. I have implemented a different solution for think different than @ssilverman in my jdk11 branch (but I don't know whether it works).
 
 A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.4, 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, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. NB: this is a far from perfect solution and javafx sketches and possibly a few others will not run with jdk11, but a least I get to diagnose those errors too.
 
@@ -8,9 +10,8 @@ adjust above for your OS/distro setup.
 ## Requirements
 
 - `jdk-11.0.1`
-- `jruby-9.2.4.0`
+- `jruby-9.2.5.0`
 - `mvn-3.5.4+`
-- `apple.jar` (_build only_) see (or may'be runtime as well a MacOS user needed to test) [vanilla-processing](https://github.com/processing/processing/blob/master/core/apple.jar)
 
 ## Building and testing
 
@@ -23,10 +24,10 @@ rake javadoc
 ## Installation
 ```bash
 jgem install --pre propane # from rubygems
-jgem install propane-3.0.1.pre-java.gem # local install requires a custom processing-core
+jgem install propane-3.1.0.pre-java.gem # local install requires a custom processing-core
 # Alternative
 jruby -S gem install --pre propane # from rubygems
-jruby -S gem install propane-3.0.1.pre-java.gem # local install requires a custom processing-core
+jruby -S gem install propane-3.1.0.pre-java.gem # local install requires a custom processing-core
 ```
 
 ## Usage
@@ -84,4 +85,5 @@ propane --install samples
 
 [building]:http://ruby-processing.github.io/building/building/
 [gh-pages]:https://ruby-processing.github.io/propane/
-[processing-core]:https://github.com/ruby-processing/processing-core
+[vanilla]:https://github.com/processing/processing/pull/5753
+https://github.com/processing/processing/pull/5747

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '3.0.1.pre'.freeze
+  VERSION = '3.1.0.pre'.freeze
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.0.1</version>
+  <version>3.1.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>
@@ -69,19 +69,16 @@
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
     <propane.basedir>${project.basedir}</propane.basedir>
     <source.directory>src</source.directory>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.4.0</version>
+      <version>9.2.5.0</version>
       <type>pom</type>
     </dependency>
-    <dependency>
-      <groupId>com.apple.eawt</groupId>
-      <artifactId>apple</artifactId>
-      <version>1.0</version>
-    </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>video</artifactId>
@@ -133,8 +130,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.0</version>
           <configuration>
-            <release>11</release>
-          </configuration>
+                <release>11</release>
+            </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>

data/propane.gemspec

@@ -10,13 +10,12 @@ 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.
+  A batteries included version of processing in ruby targetting jdk11.
   EOS
   gem.summary       = %q{ruby wrapper for processing-3.4 on MacOS, linux and windows (64bit only)}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/propane-3.0.1.jar'
-  gem.files << 'lib/apple.jar'
+  gem.files << 'lib/propane-3.1.0.jar'
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'

data/src/main/java/processing/core/ThinkDifferent.java

@@ -23,74 +23,48 @@
 package processing.core;
 
 import java.awt.Image;
+import java.awt.Taskbar;
+import java.awt.Desktop;
+import java.awt.desktop.QuitResponse;
+import java.awt.desktop.QuitEvent;
 
-import com.apple.eawt.AppEvent.QuitEvent;
-import com.apple.eawt.Application;
-import com.apple.eawt.QuitHandler;
-import com.apple.eawt.QuitResponse;
 
-
-/**
- * Deal with issues related to thinking differently.
- *
- * We have to register a quit handler to safely shut down the sketch,
- * otherwise OS X will just kill the sketch when a user hits Cmd-Q.
- * In addition, we have a method to set the dock icon image so we look more
- * like a native application.
- *
- * This is a stripped-down version of what's in processing.app.platform to fix
- * <a href="https://github.com/processing/processing/issues/3301">3301</a>.
- */
 public class ThinkDifferent {
 
-  // http://developer.apple.com/documentation/Java/Reference/1.4.2/appledoc/api/com/apple/eawt/Application.html
-  private static Application application;
-
-  // True if user has tried to quit once. Prevents us from canceling the quit
-  // call if the sketch is held up for some reason, like an exception that's
-  // managed to put the sketch in a bad state.
+  private static Desktop desktop;
+  private static Taskbar taskbar;
   static boolean attemptedQuit;
 
 
   static public void init(final PApplet sketch) {
-    if (application == null) {
-      application = Application.getApplication();
+    if (taskbar == null) {
+      taskbar = Taskbar.getTaskbar();
+    }
+    if (desktop == null) {
+      desktop = Desktop.getDesktop();
     }
 
-    application.setQuitHandler(new QuitHandler() {
-      public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
+    desktop.setQuitHandler((QuitEvent event, QuitResponse response) -> {
         sketch.exit();
         if (PApplet.uncaughtThrowable == null &&  // no known crash
-            !attemptedQuit) {  // haven't tried yet
-          response.cancelQuit();  // tell OS X we'll handle this
-          attemptedQuit = true;
+                !attemptedQuit) {  // haven't tried yet
+            response.cancelQuit();  // tell OS X we'll handle this
+            attemptedQuit = true;
         } else {
-          response.performQuit();  // just force it this time
+            response.performQuit();  // just force it this time
         }
-      }
     });
   }
 
   static public void cleanup() {
-    if (application == null) {
-      application = Application.getApplication();
+    if (desktop == null) {
+      desktop = Desktop.getDesktop();
     }
-    application.setQuitHandler(null);
+    desktop.setQuitHandler(null);
   }
 
   // Called via reflection from PSurfaceAWT and others
   static public void setIconImage(Image image) {
-    // When already set, is a sun.awt.image.MultiResolutionCachedImage on OS X
-//    Image current = application.getDockIconImage();
-//    System.out.println("current dock icon image is " + current);
-//    System.out.println("changing to " + image);
-
-    application.setDockIconImage(image);
+    taskbar.setIconImage(image);
   }
-
-
-  // Instead, just use Application.getApplication() inside your app
-//  static public Application getApplication() {
-//    return application;
-//  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre
+  version: 3.1.0.pre
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,7 +58,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: "  A batteries included version of processing in ruby.\n"
+description: "  A batteries included version of processing in ruby targetting jdk11.\n"
 email:
 - mamba2928@yahoo.co.uk
 executables:
@@ -78,7 +78,6 @@ files:
 - bin/propane
 - lib/.gitignore
 - lib/PROCESSING_LICENSE.txt
-- lib/apple.jar
 - lib/export.txt
 - lib/gluegen-rt-natives-linux-amd64.jar
 - lib/gluegen-rt-natives-macosx-universal.jar
@@ -88,7 +87,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.0.1.jar
+- lib/propane-3.1.0.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -264,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - java runtime >= 11.0.1+
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for processing-3.4 on MacOS, linux and windows (64bit only)