Skip to content

Commit caa56e2

Browse files
committed
bump version, fix $app to Processing.app
1 parent f89505b commit caa56e2

File tree

14 files changed

+21
-21
lines changed

14 files changed

+21
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### v 1.0.3
2-
Update to latest processing-3.3.5
2+
Update to latest processing-3.3.6 jruby-9.1.16.0 replace $app with Processing.app for JRubyArt-1.4.6 in examples _an incompatible change for earlier JRubyArt versions_
33

44
### v1.0.2
55
Update to latest processing-3.3.4

LICENSE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### License
22

33
This work makes use of jbox2d see included LICENCE, and is derived from,
4-
but different significantly different from Dan Shiffmans PBox2D-for-processing
4+
but different significantly different from Dan Shiffmans PBox2D-for-processing
55
who claims this:-
66

77
Copyright (c) 2014, Daniel Shiffman
@@ -24,11 +24,11 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2424
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2525
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626

27-
I include the Shiffman licence mainly because of the included example
28-
(albeit in processing) is his idea. It would be better if everyone stuck to
27+
I include the Shiffman licence mainly because of the included example
28+
(albeit in processing) is his idea. It would be better if everyone stuck to
2929
recognized licences.....
3030

3131
For my part I lean toward GPL3 but MIT is OK and matches ruby-processing and
3232
vanilla processing.
3333

34-
Copyright (c) 2014-2015, Martin Prout
34+
Copyright (c) 2014-2018, Martin Prout

examples/distance_joint/boundary.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Boundary
1111

1212
def initialize(x, y, w, h)
1313
@x, @y, @w, @h = x, y, w, h
14-
@app = $app
14+
@app = Processing.app
1515
# Define the polygon
1616
sd = PolygonShape.new
1717
# Figure out the box2d coordinates

examples/distance_joint/pair.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Pair
99
attr_reader :p1, :p2, :len, :joint
1010
# Chain constructor
1111
def initialize(x, y)
12-
@app = $app
12+
@app = Processing.app
1313
@len = 32
1414
@p1 = Particle.new(x, y)
1515
@p2 = Particle.new(x + rand(-1..1.0), y + rand(-1..1.0))

examples/distance_joint/particle.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Particle
1212

1313
def initialize(x, y)
1414
@r = 8
15-
@app = $app
15+
@app = Processing.app
1616
# Define a body
1717
bd = BodyDef.new
1818
# Set its position

examples/mouse_joint/boundary.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Boundary
1212

1313
def initialize(x, y, w, h, a)
1414
@x, @y, @w, @h, @a = x, y, w, h, a
15-
@app = $app
15+
@app = Processing.app
1616
# Define the polygon
1717
sd = PolygonShape.new
1818
# Figure out the box2d coordinates

examples/mouse_joint/box.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Box
1111
attr_accessor :body, :w, :h
1212
# Constructor
1313
def initialize(x, y)
14-
@app = $app
14+
@app = Processing.app
1515
@w, @h = 24, 24
1616
# Add the box to the box2d world
1717
make_body(Vec2.new(x, y), w, h)

examples/mouse_joint/spring.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Spring
1111
attr_reader :mouse_joint
1212

1313
def initialize
14-
@app = $app
14+
@app = Processing.app
1515
end
1616

1717
# If it exists we set its target to the mouse location

examples/revolute_joint/box.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Box
1414
# Constructor
1515
def initialize(x, y, w, h, lock)
1616
@w, @h = w, h
17-
@app = $app
17+
@app = Processing.app
1818
# Define and create the body
1919
bd = BodyDef.new
2020
bd.position.set(box2d.processing_to_world(Vec2.new(x, y)))

examples/revolute_joint/particle.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Particle
1313
attr_reader :body, :r
1414

1515
def initialize(x, y, r)
16-
@app = $app
16+
@app = Processing.app
1717
@r = r
1818
# This function puts the particle in the Box2d world
1919
makeBody(x, y, r)

examples/revolute_joint/windmill.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Windmill
1313
attr_reader :joint, :box1, :box2
1414

1515
def initialize(x, y)
16-
@app = $app
16+
@app = Processing.app
1717
# Initialize locations of two boxes
1818
@box1 = Box.new(x, y - 20, 120, 10, false)
1919
@box2 = Box.new(x, y, 10, 40, true)

lib/pbox2d/version.rb

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

33
# module to give version a namespace
44
module Pbox2d
5-
VERSION = '1.0.2'.freeze
5+
VERSION = '1.0.3'.freeze
66
end

pom.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
project 'pbox2d', 'https://github.com/ruby-processing/jbox2d' do
33

44
model_version '4.0.0'
5-
id 'ruby-processing:pbox2d', '1.0.2'
5+
id 'ruby-processing:pbox2d', '1.0.3'
66
packaging 'jar'
77

88
description 'jbox2d for JRubyArt and propane'
@@ -34,8 +34,8 @@
3434
)
3535

3636

37-
pom 'org.jruby:jruby:9.1.12.0'
38-
jar 'org.processing:core:3.3.5'
37+
pom 'org.jruby:jruby:9.1.16.0'
38+
jar 'org.processing:core:3.3.6'
3939

4040
plugin_management do
4141
plugin :resources, '2.6'

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>ruby-processing</groupId>
1313
<artifactId>pbox2d</artifactId>
14-
<version>1.0.2</version>
14+
<version>1.0.3</version>
1515
<name>pbox2d</name>
1616
<description>jbox2d for JRubyArt and propane</description>
1717
<url>https://github.com/ruby-processing/jbox2d</url>
@@ -56,13 +56,13 @@ DO NOT MODIFIY - GENERATED CODE
5656
<dependency>
5757
<groupId>org.jruby</groupId>
5858
<artifactId>jruby</artifactId>
59-
<version>9.1.12.0</version>
59+
<version>9.1.16.0</version>
6060
<type>pom</type>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.processing</groupId>
6464
<artifactId>core</artifactId>
65-
<version>3.3.5</version>
65+
<version>3.3.6</version>
6666
</dependency>
6767
</dependencies>
6868
<build>

0 commit comments

Comments
 (0)