From 8be5fd3c334efc9953c66d3234a63d1e7ee38043 Mon Sep 17 00:00:00 2001 From: Martin Prout Date: Fri, 9 Nov 2018 08:24:22 +0000 Subject: [PATCH] Bump jruby version --- .travis.yml | 2 +- CHANGELOG.md | 6 ++---- README.md | 6 +++--- lib/jruby_art/version.rb | 2 +- pom.rb | 4 ++-- pom.xml | 4 ++-- vendors/Rakefile | 4 ++-- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a8a0d7c..feee0acb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false dist: trusty rvm: - - jruby-9.2.1.0 + - jruby-9.2.2.0 jdk: - oraclejdk8 os: diff --git a/CHANGELOG.md b/CHANGELOG.md index 054a279f..7ccbdb59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ -**v1.5.5** Update to jruby-complete-9.2.1.0 +**v1.6.1** Update to jruby-complete-9.2.2.0. -**v1.5.4** Add color_group library, remove web_array helper method - -**v1.5.3** Update to expect processing-3.4 +**v1.6.0** Update to expect processing-3.4 and to jruby-complete-9.2.1.0. Add color_group library, remove web_array helper method **v1.5.2** JRuby downloads have moved diff --git a/README.md b/README.md index c0a45908..bd97d08c 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ Versions before JRubyArt-1.5.1, are unsupported, please update, preferably to la _Note the main reason for the current build to fail on travis is when the current version of [processing is not available from maven central][testing], it has only ever been available by third parties (I am eternally hopeful that one day processing.org will see the light), actually rvm with jruby as used by travis-ci is also pretty crap as judged by the build traces._ ## Requirements -A clean start for `jruby_art` that works best with the latest version of [processing-3.4](https://github.com/processing/processing/releases) and [jruby-9.2.1.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo. Changes from processing-2.0 to [processing-3.0 here](https://github.com/processing/processing/wiki/Changes-in-3.0). Should work on same platforms as vanilla processing (windows, mac, linux, [raspberrypi][pi]) for Android see Yuki Morohoshi [rubuto-processing3][]. +A clean start for `jruby_art` that works best with the latest version of [processing-3.4](https://github.com/processing/processing/releases) and [jruby-9.2.2.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo. Changes from processing-2.0 to [processing-3.0 here](https://github.com/processing/processing/wiki/Changes-in-3.0). Should work on same platforms as vanilla processing (windows, mac, linux, [raspberrypi][pi]) for Android see Yuki Morohoshi [rubuto-processing3][]. ## Requirements -A suitable version of ruby (MRI `ruby 2.3+` or `jruby-9.2.1.0`) to download gem. +A suitable version of ruby (MRI `ruby 2.3+` or `jruby-9.2.2.0`) to download gem. `processing-3.4` @@ -42,7 +42,7 @@ height: 600 # for static sketch only gem install jruby_art k9 --install # installs jruby-complete-9.2.0.0 and downloads and installs samples to ~/k9_samples cd ~/k9_samples/contributed - k9 --run jwishy.rb # if you have jruby-9.2.1.0 installed or config `JRUBY: false` + k9 --run jwishy.rb # if you have jruby-9.2.2.0 installed or config `JRUBY: false` # to use jruby-complete set `JRUBY: false` in config ``` ## Create sketches from built in templates diff --git a/lib/jruby_art/version.rb b/lib/jruby_art/version.rb index a9e693d4..88224f2c 100644 --- a/lib/jruby_art/version.rb +++ b/lib/jruby_art/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true # A wrapper for version module JRubyArt - VERSION = '1.5.5'.freeze + VERSION = '1.6.1'.freeze end diff --git a/pom.rb b/pom.rb index 8621211d..8315c5fa 100644 --- a/pom.rb +++ b/pom.rb @@ -2,7 +2,7 @@ project 'rp5extras', 'https://github.com/ruby-processing/JRubyArt' do model_version '4.0.0' - id 'ruby-processing:rp5extras', '1.5.5' + id 'ruby-processing:rp5extras', '1.6.1' packaging 'jar' description 'rp5extras for JRubyArt' @@ -32,7 +32,7 @@ 'jruby.api' => 'http://jruby.org/apidocs/' ) - pom 'org.jruby:jruby:9.2.1.0' + pom 'org.jruby:jruby:9.2.2.0' jar 'org.processing:core:3.3.7' jar 'org.processing:video:3.0.2' diff --git a/pom.xml b/pom.xml index cbd61fc3..a068807c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE 4.0.0 ruby-processing rp5extras - 1.5.5 + 1.6.0 rp5extras rp5extras for JRubyArt https://github.com/ruby-processing/JRubyArt @@ -50,7 +50,7 @@ DO NOT MODIFIY - GENERATED CODE org.jruby jruby - 9.2.1.0 + 9.2.2.0 pom diff --git a/vendors/Rakefile b/vendors/Rakefile index 031fa56b..6a19f137 100644 --- a/vendors/Rakefile +++ b/vendors/Rakefile @@ -9,7 +9,7 @@ WARNING = <<-EOS.freeze EOS -JRUBYC_VERSION = '9.2.1.0' +JRUBYC_VERSION = '9.2.2.0' EXAMPLES = '3.2' HOME_DIR = ENV['HOME'] @@ -29,7 +29,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do rescue warn(WARNING) end - check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "25998288595780e092cdac048c61d9cf0125095cbde254ae0ed2b0cfd8a7f9d2") + check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "c587e865608098930e6e51e41cf1a15a8a34b4a4ef0b2554d395b1b3c2de6dd5") end directory "../lib/ruby"