Skip to content

Commit abe18ac

Browse files
committed
bump to JRuby-9.2.9.0
1 parent 1fd3e78 commit abe18ac

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: java
22
dist: trusty
33

44
rvm:
5-
- jruby-9.2.8.0
5+
- jruby-9.2.9.0
66
jdk:
77
- openjdk11
88
os:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ A new version for jdk11 use, does not require an installed `vanilla processing`,
66

77
## Requirements
88

9-
A clean start for `jruby_art` with custom processing core included, built for [jruby-9.2.8.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo.
9+
A clean start for `jruby_art` with custom processing core included, built for [jruby-9.2.9.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo.
1010

1111
## Requirements
1212

13-
A suitable version of ruby (MRI `ruby 2.3+` or `jruby-9.2.8.0`) to download gem.
13+
A suitable version of ruby (MRI `ruby 2.3+` or `jruby-9.2.9.0`) to download gem.
1414

1515
`open-jdk11.03+` currently FX2D is not included. Currently you can ignore `illegal reflective access` warnings, [see here how to suppress them][warnings]. 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.
1616

@@ -35,9 +35,9 @@ java_args:
3535

3636
```bash
3737
gem install jruby_art
38-
k9 --install # installs jruby-complete-9.2.8.0 and downloads and installs samples to ~/k9_samples
38+
k9 --install # installs jruby-complete-9.2.9.0 and downloads and installs samples to ~/k9_samples
3939
cd ~/k9_samples/contributed
40-
k9 --run jwishy.rb # if you have jruby-9.2.8.0 installed or config `JRUBY: false`
40+
k9 --run jwishy.rb # if you have jruby-9.2.9.0 installed or config `JRUBY: false`
4141
# to use jruby-complete set `JRUBY: false` in config
4242
```
4343

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require 'erb'
55

66
MVN = Gem.win_platform? ? File.expand_path('mvnw.cmd') : File.expand_path('mvnw')
77

8-
task default: %i[compile install_joglgem test]
8+
task default: %i[compile install_jogl gem test]
99

1010
# depends on installed processing, with processing on path
1111
desc 'Copy Jars'

lib/jruby_art/helper_methods.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def color(*args)
5757
end
5858

5959
def web_to_color_array(web)
60-
Java::Monkstone::ColorUtil.webArray(web)
60+
Java::Monkstone::ColorUtil.webArray(web.to_java(:string))
6161
end
6262

6363
def int_to_ruby_colors(p5color)

pom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
'jogl.version' => '2.3.2',
2626
'jruby.api' => 'http://jruby.org/apidocs/' )
2727

28-
pom 'org.jruby:jruby:9.2.8.0'
28+
pom 'org.jruby:jruby:9.2.9.0'
2929
jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
3030
jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
3131
jar 'org.processing:video:3.0.2'

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ DO NOT MODIFIY - GENERATED CODE
4646
<dependency>
4747
<groupId>org.jruby</groupId>
4848
<artifactId>jruby</artifactId>
49-
<version>9.2.8.0</version>
49+
<version>9.2.9.0</version>
5050
<type>pom</type>
5151
</dependency>
5252
<dependency>

vendors/Rakefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WARNING = <<~WARN
1111
1212
WARN
1313
# https://github.com/processing/processing-video/releases/download/r6-v2.0-beta4/video-2.0-beta4.zip
14-
JRUBYC_VERSION = '9.2.8.0'
14+
JRUBYC_VERSION = '9.2.9.0'
1515
SOUND = 'sound.zip'
1616
SOUND_VERSION = 'v2.2.2'
1717
VIDEO = 'video-2.0-beta4.zip'
@@ -24,18 +24,13 @@ CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar"
2424
CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
2525

2626
file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
27-
begin
28-
system "#{WGET} https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
29-
rescue NameError
30-
warn(WARNING)
31-
end
27+
system "#{WGET} https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
3228
end
3329

3430
desc 'check dependency'
3531
task :check_dependency do
3632
WGET ||= system 'which wget'
3733
warn(WARNING) unless WGET
38-
puts WGET
3934
end
4035

4136
desc 'get sha256'

0 commit comments

Comments
 (0)