Skip to content

Commit

Permalink
Bump jruby version
Browse files Browse the repository at this point in the history
  • Loading branch information
monkstone committed Nov 9, 2018
1 parent 1053f74 commit 8be5fd3
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: false
dist: trusty

rvm:
- jruby-9.2.1.0
- jruby-9.2.2.0
jdk:
- oraclejdk8
os:
Expand Down
6 changes: 2 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/jruby_art/version.rb
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
<modelVersion>4.0.0</modelVersion>
<groupId>ruby-processing</groupId>
<artifactId>rp5extras</artifactId>
<version>1.5.5</version>
<version>1.6.0</version>
<name>rp5extras</name>
<description>rp5extras for JRubyArt</description>
<url>https://github.com/ruby-processing/JRubyArt</url>
Expand Down Expand Up @@ -50,7 +50,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>9.2.1.0</version>
<version>9.2.2.0</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions vendors/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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"
Expand Down

0 comments on commit 8be5fd3

Please sign in to comment.