propane 3.7.0.pre-java → 3.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e8998483c06aa7d27737cd3b9d1f87ef8edb0268367f58d42356b7f5c20aa1
-  data.tar.gz: de9bb8230f17b2aa2cd0da453b465c8d9f529a74b74c0de0f6c39aa62fb39eb9
+  metadata.gz: 8d91c85e879a5cf795566043ce69accbc17b2d71f34ddbfbe7f3a7855975b5e3
+  data.tar.gz: 70ddc22146913b60b6cf5dc66e9cbb47efa20e394acc039aca71a16282f80e76
 SHA512:
-  metadata.gz: a54ad411a64dd89249880b5a72cf4687b475267196659bb1887b0fe9dbbce3013357ba5196a0da2369cbc92a49a9410c1c9155f9028feff3152149725c021957
-  data.tar.gz: 2ca39c591cb7a15b0a9f592c4f335ba5062c1a9b6dbda26afb7707d981b9d73278c0e84044b948f61f4f53eb274f5dd9430c96600d599db5a29c06cd47849c44
+  metadata.gz: 6d17d5093f9e26213ec22d936ae15cf0c50b3cc9ae162423c7499294cc0d96df7bc964e20f9cd9bfb47b31afeed9d1407482a1137fc0f837e7235950fb25963b
+  data.tar.gz: e22db42e8e8b3a780da3faa62fbbcb7bd7f653ba6bda5f92cc3338853178d2a21e77662e1d08871cbb2b6223ccdffe4047d4e5ec7e78bea946424c6d660d7190

data/CHANGELOG.md

@@ -1,6 +1,4 @@
-**v3.7.0** Experimental support for ios-arm64
-
-**v3.6.0** Recommend JRuby-9.2.14.0 use video-2.0 release
+**v3.7.1** Recommend JRuby-9.2.15.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

@@ -10,8 +10,8 @@ adjust above for your OS/distro setup.
 
 There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
 
-- `jdk-11.0.3+`
-- `jruby-9.2.12.0`
+- `jdk-11.0.7+`
+- `jruby-9.2.14.0`
 
 Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
 

data/lib/propane/runner.rb

@@ -69,31 +69,29 @@ module Propane
       SketchWriter.new(File.basename(filename, '.rb'), argc).write
     end
 
-    def show_version
-      v_format = "Propane version %s\nJRuby version %s"
-      puts format(v_format, Propane::VERSION, JRUBY_VERSION)
-    end
-
     def show_version
       require 'erb'
       require_relative 'helpers/version_error'
       raise JDKVersionError if ENV_JAVA['java.specification.version'] < '11'
 
-      template = ERB.new <<-EOF
+      template = ERB.new <<-VERSION
         propane version <%= Propane::VERSION %>
         JRuby version <%= JRUBY_VERSION %>
-      EOF
+      VERSION
       puts template.result(binding)
     end
 
     def install(library)
+      library ||= 'new'
       choice = library.downcase
-      valid = Regexp.union('samples', 'sound', 'video', 'glvideo')
-      unless valid.match?(choice)
-        return warn format('No installer for %<lib>s', lib: choice)
+      case choice
+      when /samples|sound|video/
+        system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
+      when /new/
+        system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_samples"
+      else
+        warn format('No installer for %<lib>s', lib: choice)
       end
-
-      system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
     end
   end
   # class Runner

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Propane
-  VERSION = '3.7.0.pre'
+  VERSION = '3.7.1'
 end

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.7.0.pre'
+  id 'propane:propane:3.7.1'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -46,7 +46,7 @@ project 'propane', 'https://github.com/monkstone/propane' do
       'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
       'jruby.api' => 'http://jruby.org/apidocs/')
 
-      pom 'org.jruby:jruby:9.2.14.0'
+    pom 'org.jruby:jruby:9.2.15.0'
       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}'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.7.0.pre</version>
+  <version>3.7.1</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>
@@ -74,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.14.0</version>
+      <version>9.2.15.0</version>
       <type>pom</type>
     </dependency>
     <dependency>

data/propane.gemspec

@@ -21,11 +21,9 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
   gem.files << 'lib/gluegen-rt-natives-macosx-universal.jar'
-  gem.files << 'lib/gluegen-rt-natives-ios-arm64.jar'
   gem.files << 'lib/gluegen-rt-natives-windows-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
-  gem.files << 'lib/gluegen-rt-natives-macosx-universal.jar'
-  gem.files << 'lib/jogl-all-natives-ios-arm64.jar'
+  gem.files << 'lib/jogl-all-natives-macosx-universal.jar'
   gem.files << 'lib/jogl-all-natives-windows-amd64.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -35,5 +33,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime >= 11.0.7+'
+  gem.requirements << 'java runtime >= 11.0.2+'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.7.0.pre
+  version: 3.7.1
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -103,16 +103,15 @@ files:
 - lib/.gitignore
 - lib/PROCESSING_LICENSE.txt
 - lib/export.txt
-- lib/gluegen-rt-natives-ios-arm64.jar
 - lib/gluegen-rt-natives-linux-amd64.jar
 - lib/gluegen-rt-natives-macosx-universal.jar
 - lib/gluegen-rt-natives-windows-amd64.jar
 - lib/gluegen-rt.jar
-- lib/jogl-all-natives-ios-arm64.jar
 - lib/jogl-all-natives-linux-amd64.jar
+- lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.7.0.pre.jar
+- lib/propane-3.7.1.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -293,11 +292,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
-- java runtime >= 11.0.7+
+- java runtime >= 11.0.2+
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4