propane 3.5.0-java → 3.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7837b349f30c7e79ee7e90b36eb7603174a0228d49fcaa8ec321ea5db24ae112
-  data.tar.gz: 38d0c0cc6972e111fe2bb7a81cf3f5bbe20cbb795b31f880acfaaff8a1008023
+  metadata.gz: e735f345da64c2f55adcad27c1df98b630e6a73aa3c3d0c6551ef440b13c5546
+  data.tar.gz: 6a31bd1774ac6fee490dc72cb4958b9c315a24c524cb946612e7815613407b23
 SHA512:
-  metadata.gz: 9f2f530ad672d28338340409760883e5bec5ce735a07fac5b76e9fba5e8965c37674410eb54c6aeec46d78e3568850719765738c71b359cdb37a0b30d6060af5
-  data.tar.gz: b0f30134fb858c2dbbc3a40eb9772e9788e1bca09f3cb2c893139bf690cef294d9dc5a30cf3667fd73016144807f6778b2cb5d13a02111f85ae56c91e5a64a17
+  metadata.gz: 9c8b9399f233cfd4de9a05898ba8751762d2a082122163ebc690977f342efb03198dc59657a51419f19c7e8d3fa245e2fcb273fe75639c1d2d2aed1732e81cd5
+  data.tar.gz: 84e74e51efe2dae32c8457c3b163385e4db9d0c280282d593c4f61428d4945ede7e0e9005d4d70520774df8851ad58ed4c3a84b2bc08f481efde05ced17c8383

data/.mvn/extensions.xml

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

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -20,7 +20,7 @@ import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
-    private static final String WRAPPER_VERSION = "0.5.5";
+    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.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.11.1
+  - jruby-9.2.12.0
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-**v3.5.0** Rebase processing core code around Sam Pottinhgers 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.
+**v3.9.0** Make OpenSimplex2 noise default noise, implement pdf and svg export libraries.
+
+**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.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.
 
 **v3.4.3** Use Map.of to initialize HashMap bump processing version in build bump to jruby-9.2.11.0
 

data/README.md

@@ -8,12 +8,10 @@ adjust above for your OS/distro setup.
 
 ## Requirements
 
-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.
+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.
 
-- `jdk-11.0.3+`
-- `jruby-9.2.11.1`
-
-Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
+- `jdk-11.0.7+`
+- `jruby-9.2.16.0`
 
 ## Building and testing
 
@@ -27,10 +25,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.4.3-java.gem # local install
+jgem install propane-3.9.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.4.3-java.gem # local install
+jruby -S gem install propane-3.9.0-java.gem # local install
 ```
 
 ## Check Install
@@ -39,19 +37,6 @@ To check version and confirm gem bin files are on your path (also checks JDK ver
 ```bash
 propane --version
 ```
-
-## Suppressing Reflective Access warnings
-
-Since propane-3.4.3 it is possible to suppress reflective access warnings by including a `~/.jruby.java_opts` file with following contents:-
-
-```bash
---add-opens java.base/java.lang=ALL-UNNAMED
---add-opens java.desktop/java.awt=ALL-UNNAMED
---add-opens java.desktop/sun.awt=ALL-UNNAMED
---add-opens java.desktop/sun.java2d.opengl=ALL-UNNAMED
-```
-Mainly needed for opengl sketches.
-
 ## Usage
 
 A propane sketch:-
@@ -103,12 +88,12 @@ See [gh-pages][gh-pages] for more detailed instructions and much more.
 
 ## Examples
 
-[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.4
+[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.5
 + syntax now we can. To install the samples.  The samples get copied to `~/propane_samples`. Depends on wget.
 ```bash
 propane --install samples
 ```
- please move existing `propane_samples` if you wish to keep them. The current release features several PixelFlow glsl library examples, including a few shadertoy demos as sketches.
+ please move existing `propane_samples` if you wish to keep them. The current release features some noise sketches that exploit the new choice of noise implementation.
 
 [adopt]: https://adoptopenjdk.net/
 [building]:http://ruby-processing.github.io/building/building/

data/Rakefile

@@ -8,7 +8,7 @@ task default: %i[init compile install test gem]
 desc 'Copy Jars'
 task :init do
   jogl24 = File.join(ENV['HOME'], 'jogl24')
-  opengl = Dir.entries(jogl24).grep(/amd64|universal/).select { |jar| jar =~ /linux|windows|macosx/ }
+  opengl = Dir.entries(jogl24).grep(/amd64|universal|arm64/).select { |jar| jar =~ /linux|windows|macosx|ios|/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
     FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
@@ -17,12 +17,13 @@ end
 
 desc 'Install'
 task :install do
+  sh "mvn dependency:copy"
   sh "mv target/propane-#{Propane::VERSION}.jar lib"
 end
 
 desc 'Gem'
 task :gem do
-  sh 'gem build propane.gemspec'
+  sh 'jgem build propane.gemspec'
 end
 
 desc 'Document'

data/lib/propane.rb

@@ -8,4 +8,5 @@ end
 Dir["#{PROPANE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
-require_relative 'propane/app'
+require "#{PROPANE_ROOT}/lib/propane/app"
+require "#{PROPANE_ROOT}/lib/propane/helpers/numeric"

data/lib/propane/app.rb

@@ -16,6 +16,10 @@ module Propane
     java_import 'monkstone.vecmath.ShapeRender'
   end
 
+  module NoiseModule
+    java_import 'monkstone.noise.NoiseMode'
+  end
+
   # This class is the base class the user should inherit from when making
   # their own sketch.
   #

data/lib/propane/helper_methods.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 
 # processing module wrapper
-require_relative 'helpers/numeric'
 module Propane
   # Provides some convenience methods
   module HelperMethods

data/lib/propane/runner.rb

@@ -55,6 +55,8 @@ module Propane
         # assumed to have this option.
         opts.on('-h', '--help', 'Display this screen') do
           puts opts
+          puts ''
+          puts 'Run a sketch: jruby [--dev] [<sketch.rb>]'
           exit
         end
       end
@@ -67,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.5.0'
+  VERSION = '3.9.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/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/pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.5.0'
+  id 'propane:propane:3.9.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -35,48 +35,70 @@ project 'propane', 'https://github.com/monkstone/propane' do
   issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
 
   source_control(url: 'https://github.com/ruby-processing/propane',
-                 connection: 'scm:git:git://github.com/ruby-processing/propane.git',
-                 developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git')
+    connection: 'scm:git:git://github.com/ruby-processing/propane.git',
+    developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git')
 
-  properties('propane.basedir' => '${project.basedir}',
-             'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
-             'source.directory' => 'src',
-             'polyglot.dump.pom' => 'pom.xml',
-             'project.build.sourceEncoding' => 'utf-8',
-             'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
-             'jruby.api' => 'http://jruby.org/apidocs/')
+    properties('propane.basedir' => '${project.basedir}',
+      'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
+      'source.directory' => 'src',
+      'polyglot.dump.pom' => 'pom.xml',
+      'project.build.sourceEncoding' => 'utf-8',
+      'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
+      'batik.version' => '1.14',
+      'itextpdf.version' => '5.5.13.2',
+      'jruby.api' => 'http://jruby.org/apidocs/')
 
-  pom 'org.jruby:jruby:9.2.11.1'
-  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}'
+      pom 'org.jruby:jruby:9.2.16.0'
+      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',
-           'generateBackupPoms' => 'false')
-    plugin(:compiler, '3.8.1',
-           'release' => '11')
-    plugin(:javadoc, '3.2.0',
-           'detectOfflineLinks' => 'false',
-           'links' => ['${jruby.api}',
-                       '${processing.api}'])
-    plugin(
-      :jar, '3.2.0',
-      'archive' => {
-        'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
-      }
-    )
-  end
-  build do
-    resource do
-      directory '${source.directory}/main/java'
-      includes '**/**/*.glsl', '**/*.jnilib'
-      excludes '**/**/*.java'
-    end
-    resource do
-      directory '${source.directory}/main/resources'
-      includes '**/*.png', '*.txt'
-      excludes
-    end
-  end
-end
+      overrides do
+        plugin('org.codehaus.mojo:versions-maven-plugin:2.7',
+          'generateBackupPoms' => 'false')
+          plugin(:compiler, '3.8.1',
+            'release' => '11')
+            plugin :dependency, '3.1.2' 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.2.0',
+              'detectOfflineLinks' => 'false',
+              'links' => ['${jruby.api}',
+                '${processing.api}'])
+                plugin(:jar, '3.2.0',
+                  'archive' => {
+                    'manifestEntries' => {
+                      'Automatic-Module-Name' => 'processing.core'
+                    }
+                    })
+                  end
+                  build do
+                    resource do
+                      directory '${source.directory}/main/java'
+                      includes '**/**/*.glsl', '**/*.jnilib'
+                      excludes '**/**/*.java'
+                    end
+                    resource do
+                      directory '${source.directory}/main/resources'
+                      includes '**/*.png', '*.txt'
+                      excludes
+                    end
+                  end
+                end

data/pom.xml

@@ -2,16 +2,16 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.5.0</version>
+  <version>3.9.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,6 +62,8 @@ DO NOT MODIFIY - 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>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -74,9 +76,19 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.11.1</version>
+      <version>9.2.16.0</version>
       <type>pom</type>
     </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>
       <artifactId>video</artifactId>
@@ -130,6 +142,33 @@ DO NOT MODIFIY - GENERATED CODE
             <release>11</release>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.1.2</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.2.0</version>
@@ -147,7 +186,7 @@ DO NOT MODIFIY - GENERATED CODE
           <configuration>
             <archive>
               <manifestEntries>
-                <Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
+                <Automatic-Module-Name>processing.core</Automatic-Module-Name>
               </manifestEntries>
             </archive>
           </configuration>