Skip to content

Commit 0645f57

Browse files
committed
bump versions
1 parent 978e1c2 commit 0645f57

File tree

6 files changed

+34
-38
lines changed

6 files changed

+34
-38
lines changed

pom.rb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
roles 'developer'
2727
end
2828

29+
developer 'sampottinger' do
30+
name 'Sam Pottinger'
31+
roles 'developer'
32+
end
33+
2934
issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
3035

3136
source_control( :url => 'https://github.com/ruby-processing/propane',
@@ -40,33 +45,27 @@
4045
'jogl.version' => '2.3.2',
4146
'jruby.api' => 'http://jruby.org/apidocs/' )
4247

43-
pom 'org.jruby:jruby:9.2.7.0'
48+
pom 'org.jruby:jruby:9.2.8.0'
4449
jar 'org.processing:video:3.2.3'
4550
jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
4651
jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
4752

4853
overrides do
4954
plugin( 'org.codehaus.mojo:versions-maven-plugin:2.7',
5055
'generateBackupPoms' => 'false' )
51-
plugin( :compiler, '3.8.0',
56+
plugin( :compiler, '3.8.1',
5257
'release' => '11' )
53-
plugin( :javadoc, '3.0.1',
58+
plugin( :javadoc, '3.1.1',
5459
'detectOfflineLinks' => 'false',
5560
'links' => [ '${jruby.api}',
5661
'${processing.api}' ] )
5762
plugin(
58-
:jar, '3.1.0',
63+
:jar, '3.1.2',
5964
'archive' => {
6065
'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
6166
}
6267
)
63-
plugin(
64-
:jar, '3.1.0',
65-
'archive' => {
66-
'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
67-
}
68-
)
69-
end
68+
end
7069
build do
7170
resource do
7271
directory '${source.directory}/main/java'

pom.xml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ DO NOT MODIFIY - GENERATED CODE
4444
<role>developer</role>
4545
</roles>
4646
</developer>
47+
<developer>
48+
<id>sampottinger</id>
49+
<name>Sam Pottinger</name>
50+
<roles>
51+
<role>developer</role>
52+
</roles>
53+
</developer>
4754
</developers>
4855
<scm>
4956
<connection>scm:git:git://github.com/ruby-processing/propane.git</connection>
@@ -67,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
6774
<dependency>
6875
<groupId>org.jruby</groupId>
6976
<artifactId>jruby</artifactId>
70-
<version>9.2.7.0</version>
77+
<version>9.2.8.0</version>
7178
<type>pom</type>
7279
</dependency>
7380
<dependency>
@@ -118,14 +125,14 @@ DO NOT MODIFIY - GENERATED CODE
118125
</plugin>
119126
<plugin>
120127
<artifactId>maven-compiler-plugin</artifactId>
121-
<version>3.8.0</version>
128+
<version>3.8.1</version>
122129
<configuration>
123130
<release>11</release>
124131
</configuration>
125132
</plugin>
126133
<plugin>
127134
<artifactId>maven-javadoc-plugin</artifactId>
128-
<version>3.0.1</version>
135+
<version>3.1.1</version>
129136
<configuration>
130137
<detectOfflineLinks>false</detectOfflineLinks>
131138
<links>
@@ -136,18 +143,7 @@ DO NOT MODIFIY - GENERATED CODE
136143
</plugin>
137144
<plugin>
138145
<artifactId>maven-jar-plugin</artifactId>
139-
<version>3.1.0</version>
140-
<configuration>
141-
<archive>
142-
<manifestEntries>
143-
<Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
144-
</manifestEntries>
145-
</archive>
146-
</configuration>
147-
</plugin>
148-
<plugin>
149-
<artifactId>maven-jar-plugin</artifactId>
150-
<version>3.1.0</version>
146+
<version>3.1.2</version>
151147
<configuration>
152148
<archive>
153149
<manifestEntries>

propane.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
1515
gem.summary = %q{ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)}
1616
gem.homepage = 'https://ruby-processing.github.io/propane/'
1717
gem.files = `git ls-files`.split($/)
18-
gem.files << 'lib/propane-3.3.0.jar'
18+
gem.files << 'lib/propane-3.3.1.jar'
1919
gem.files << 'lib/gluegen-rt.jar'
2020
gem.files << 'lib/jogl-all.jar'
2121
gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
@@ -27,9 +27,9 @@ Gem::Specification.new do |gem|
2727
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
2828
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
2929
gem.add_development_dependency 'rake', '~> 12.3'
30-
gem.add_development_dependency 'minitest', '~> 5.10'
30+
gem.add_development_dependency 'minitest', '~> 5.11'
3131
gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0'
3232
gem.require_paths = ['lib']
3333
gem.platform = 'java'
34-
gem.requirements << 'java runtime >= 11.0.1+'
34+
gem.requirements << 'java runtime >= 11.0.2+'
3535
end

src/main/java/monkstone/vecmath/vec2/Vec2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public IRubyObject mag(ThreadContext context) {
399399
@JRubyMethod(name = "set_mag")
400400

401401
public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
402-
double new_mag = (Double) scalar.toJava(Double.class);
402+
double new_mag = scalar.toJava(Double.class);
403403
if (block.isGiven()) {
404404
if (!(boolean) block.yield(context, scalar).toJava(Boolean.class)) {
405405
return this;

src/main/java/monkstone/vecmath/vec3/Vec3.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public IRubyObject op_mul(ThreadContext context, IRubyObject scalar) {
385385
@JRubyMethod(name = "/", required = 1)
386386
public IRubyObject op_div(ThreadContext context, IRubyObject scalar) {
387387
Ruby runtime = context.runtime;
388-
double divisor = (scalar instanceof RubyFloat)
388+
var divisor = (scalar instanceof RubyFloat)
389389
? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
390390
if (Math.abs(divisor) < Vec3.EPSILON) {
391391
return this;
@@ -432,7 +432,7 @@ public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block bloc
432432
return this;
433433
}
434434
}
435-
double new_mag = (scalar instanceof RubyFloat)
435+
var new_mag = (scalar instanceof RubyFloat)
436436
? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
437437
double current = Math.sqrt(jx * jx + jy * jy + jz * jz);
438438
if (current > EPSILON) {

src/main/java/processing/event/Event.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Event {
2828

2929
// These correspond to the java.awt.Event modifiers (not to be confused with
3030
// the newer getModifiersEx), though they're not guaranteed to in the future.
31-
static public final int SHIFT = 1 << 0;
31+
static public final int SHIFT = 1;
3232
static public final int CTRL = 1 << 1;
3333
static public final int META = 1 << 2;
3434
static public final int ALT = 1 << 3;
@@ -52,11 +52,12 @@ public int getFlavor() {
5252
}
5353

5454
/**
55-
* Get the platform-native event object. This might be the java.awt event on
56-
* the desktop, though if you're using OpenGL on the desktop it'll be a NEWT
57-
* event that JOGL uses. Android events are something else altogether.
58-
* Bottom line, use this only if you know what you're doing, and don't make
59-
* assumptions about the class type.
55+
* Get the platform-native event object.This might be the java.awt event on
56+
the desktop, though if you're using OpenGL on the desktop it'll be a NEWT
57+
event that JOGL uses. Android events are something else altogether.
58+
Bottom line, use this only if you know what you're doing, and don't make
59+
assumptions about the class type.
60+
* @return
6061
*/
6162
public Object getNative() {
6263
return nativeObject;

0 commit comments

Comments
 (0)