Skip to content

Commit 2557e60

Browse files
committed
bump version
1 parent 702b6b7 commit 2557e60

7 files changed

+14
-12
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
v2.5.1 Update to JRuby-9.3.1.0, under the hood changes in how we access java fields, no using `field` in place of `declared_field`, possible since JRuby-9.3.0.0 required since JRuby-9.3.1.0.
2+
13
v2.5.0 Update to JRuby-9.3.0.0.
24

35
v2.4.2 Update to JRuby-9.2.19, getting ready for JRuby-9.3+.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Requires java to build (and [jogl-2.4.0-rc jars][jogl_jars]), but uses a maven w
1919
```bash
2020
cd PiCrate # or whatever you call it
2121
rake # assumes an installed version of vanilla processing
22-
jgem install picrate-2.5.0-java.gem
22+
jgem install picrate-2.5.1-java.gem
2323

2424
```
2525
To create a template sketch:-

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
1414

1515
```bash
1616
cd /opt
17-
sudo tar xzvf /pathToDownload/jruby-bin-9.3.0.0.tar.gz
17+
sudo tar xzvf /pathToDownload/jruby-bin-9.3.1.0.tar.gz
1818
```
1919

2020
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.
@@ -42,5 +42,5 @@ The [picrate2_install.sh][bash] script currently installs jruby-9.3.0.0 and picr
4242

4343
If you know better please post on wiki
4444

45-
[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.0.0/jruby-dist-9.3.0.0-bin.tar.gz"
45+
[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.1.0/jruby-dist-9.3.1.0-bin.tar.gz"
4646
[bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

docs/_posts/2019-11-11-getting_started_buster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: post
3-
title: "Getting Started Buster"
3+
title: "Getting Started RaspbianOS"
44
date: 2019-11-11 07:34:13
55
categories: PiCrate update
66
permalink: /getting_buster/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permalink: /getting_manjaro/
88
If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk16) should work.
99

1010
```bash
11-
sudo pacman -S jre-openjdk # current distro version jdk14
11+
sudo pacman -S jre-openjdk # current distro version jdk16
1212
```
1313
You can also use pacman to install jruby
1414
```bash

lib/picrate/helper_methods.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ def find_method(method_name)
117117
# some methods. Add to this list as needed.
118118
def proxy_java_fields
119119
fields = %w[key frameRate mousePressed keyPressed]
120-
methods = fields.map { |field| java_class.declared_field(field) }
121-
@declared_fields = Hash[fields.zip(methods)]
120+
methods = fields.map { |field| java_class.field(field) }
121+
@jfields = Hash[fields.zip(methods)]
122122
end
123123

124124
# Fix java conversion problems getting the last key
125125
# If it's ASCII, return the character, otherwise the integer
126126
def key
127-
int = @declared_fields['key'].value(java_self)
127+
int = @jfields['key'].value(java_self)
128128
int < 256 ? int.chr : int
129129
end
130130

@@ -161,19 +161,19 @@ def save_strings(filename, strings)
161161

162162
# frame_rate needs to support reading and writing
163163
def frame_rate(fps = nil)
164-
return @declared_fields['frameRate'].value(java_self) unless fps
164+
return @jfields['frameRate'].value(java_self) unless fps
165165

166166
super(fps)
167167
end
168168

169169
# Is the mouse pressed for this frame?
170170
def mouse_pressed?
171-
@declared_fields['mousePressed'].value(java_self)
171+
@jfields['mousePressed'].value(java_self)
172172
end
173173

174174
# Is a key pressed for this frame?
175175
def key_pressed?
176-
@declared_fields['keyPressed'].value(java_self)
176+
@jfields['keyPressed'].value(java_self)
177177
end
178178

179179
private

pom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
project 'picrate', 'http://maven.apache.org' do
44
model_version '4.0.0'
5-
id 'ruby-processing:picrate:2.5.0'
5+
id 'ruby-processing:picrate:2.5.1'
66
packaging 'jar'
77

88
description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'

0 commit comments

Comments
 (0)