Bump JRuby version

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,5 @@
+v2.1.1 Bump to JRuby-9.2.13.0, include examples using ruby `clamp` in place of processing `constrain`.
+
 v2.1.0 Refactor how we configure geany so we can use ENV['HOME'] rather hard code config file. Bump to JRuby-9.2.12.0, include Sam Pottingers July 2020 staging changes.
 
 v2.0.1 Use JOGL-2.4.0-rc fixes reflection warnings, remove geomerative and wordcram gem dependencies since can now be in step with JRubyArt and propane (re jdk compatibility), bump version for release. Removed Gottfreid Haider shaders, warn legacy driver doesn't work with P2D and P3D sketches. Support aarch64 architecture on RaspberriPI4.

README.md

@@ -19,7 +19,7 @@ Requires java to build (and jogl-2.4.0-rc jars), but uses a maven wrapper so you
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.0.1-java.gem
+jgem install picrate-2.1.1-java.gem
 
 ```
 To create a template sketch:-

docs/_methods/alternative_methods.md

@@ -28,8 +28,9 @@ Here is a list of ruby alternatives to some 'processing' convenience methods; wh
 |               |`second`                |`t.second`           |
 |               |`year`                  |`t.year`             |
 |custom math    |`map(x, b0, eo, b1, e1)`|`map1d(x, (b0..e0), (b1..e1))`|
-|               |`map(x, b0, eo, b1, e1)`|`p5map(x, b0, e0, b1, e1)`|
 |               |`max(array)            `|`array.max`        |
+|               |`map(x, b0, eo, b1, e1)`|`p5map(x, b0, e0, b1, e1)`|
+|               |`constrain(x, lo, hi)`  |`x.clamp(lo, hi)`  |
 |               |`min(array)            `|`array.min`        |
 |conversion     |`degrees(theta)`        |`theta.degrees`    |
 |conversion     |`radians(theta)`        |`theta.radians`    |

docs/_posts/2018-05-06-install_jruby.md

@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.2.11.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.2.13.0.tar.gz
 ```
 
 Then use the excellent `update-alternatives` tool to provide symbolic links to `jruby`, `jgem`, `jirb` and `rake` especially if you haven't installed `mri` ruby.
@@ -38,9 +38,9 @@ export PATH="${PATH}:${GEM_PATH}/bin"
 
 ### Automated install using bash ###
 
-The [picrate2_install.sh][bash] script currently installs jruby-9.2.11.0 and picrate-2.0.pre.
+The [picrate2_install.sh][bash] script currently installs jruby-9.2.13.0 and picrate-2.1.1.
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.11.0/jruby-dist-9.2.11.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.13.0/jruby-dist-9.2.13.0-bin.tar.gz"
 [bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

docs/_posts/2020-03-09-auto_install_picrate.md

@@ -18,10 +18,9 @@ bash picrate2_install.sh # to run default task
 2. Installs JRuby to `/opt`
 3. Uses `update-alternatives` to configure `jruby`, `jgem` and `jirb`
 4. The script checks for `GEM_HOME`, if undefined it modifies `~/.profile` to define `GEM_HOME` and puts gem binaries on your path, at logon.
-5. Installs jdk11 if required sets `JAVA_HOME`, needed to support jruby (--add-opens)
+5. Installs jdk11 if required sets `JAVA_HOME`, needed to support jruby
 6. Creates `~/.gemrc` with `gem: no-document`
-7. Creates `~/.jruby.java_opts` with `--add-opens` to suppress reflective access warnings.
-8. Installs `picrate` gem
+7. Installs `picrate` gem
 To install `picrate_samples` also configures `geanyIDE` for use with `picrate` run
 `picrate --install` in a bash console
 

docs/_posts/2020-05-11-getting_started_manjaro.md

@@ -8,7 +8,7 @@ permalink: /getting_manjaro/
 Currently Manjaro does not come with a pre-installed java. So the first step is to install a `jdk` we currently recommend installing hotspot adopt-openjdk11 from the AdoptOpenJDK project (there may be issues with distro version). Setting the JDK_HOME environment (easiest done `/etc/profile.d`) and then manually install the latest JRuby. It is probably worth creating a symbolic links to `/usr/bin/jruby` and `/usr/bin/jgem` from wherever you installed jruby eg /opt folder.
 
 ```bash
-mkdir -p ~/.gem/jruby/2.5.0
+mkdir -p ~/.gem/ruby/2.5.0
 ```
 
 Now set your `GEM_HOME`, `GEM_PATH` and amend your `PATH` as follows:-

lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.1.0'
+  id 'ruby-processing:picrate:2.1.1'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -31,7 +31,7 @@
              'project.build.sourceEncoding' => 'utf-8',
              'polyglot.dump.pom' => 'pom.xml')
 
-  pom 'org.jruby:jruby:9.2.12.0'
+  pom 'org.jruby:jruby:9.2.13.0'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -76,7 +76,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.12.0</version>
+      <version>9.2.13.0</version>
       <type>pom</type>
     </dependency>
     <dependency>

vendors/Rakefile

@@ -8,7 +8,7 @@ SOUND = 'sound.zip'
 SOUND_VERSION = 'v1.3.2'
 VIDEO = 'video-2.0-beta4.zip'
 VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '0.5.4'
+EXAMPLES = '0.5.5'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')