Skip to content

Commit 48b58f2

Browse files
committed
Use jogl-2.4.0-rc jars
1 parent d9df5bd commit 48b58f2

5 files changed

Lines changed: 9 additions & 10 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
**v2.4.0** Update to use jruby-complete-9.2.11.1 recommended java version AdoptOpenJDK-13+ or Openj9-14+
2+
13
**v2.3.0** Update to use jruby-complete-9.2.11.0 recommended java version AdoptOpenJDK-13+
24

35
**v2.2.2** Fix for Native library bug on Windows by Jay Scott. Added minim examples. Bump processing-version in build.

Rakefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@ task default: %i[compile install_jogl gem test]
1010
# depends on installed processing, with processing on path
1111
desc 'Copy Jars'
1212
task :install_jogl do
13-
# for MacOS Widows? and Archlinux etc
14-
# processing_root = File.dirname(`readlink -f $(which processing)`)
15-
# alternative for debian linux etc
16-
processing_root = File.join(ENV['HOME'], 'processing-3.5.4')
17-
jar_dir = File.join(processing_root, 'core', 'library')
18-
opengl = Dir.entries(jar_dir).grep(/amd64|macosx-universal/)
13+
# Temporarily load jogl-2.4.0-rc from a local directory
14+
jogl24 = File.join(ENV['HOME'], 'jogl24')
15+
opengl = Dir.entries(jogl24).grep(/amd64|macosx-universal/)
1916
opengl.concat %w[jogl-all.jar gluegen-rt.jar]
2017
opengl.each do |gl|
21-
FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
18+
FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
2219
end
2320
end
2421

lib/jruby_art/version.rb

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

33
# A wrapper for version
44
module JRubyArt
5-
VERSION = '2.3.0'
5+
VERSION = '2.4.0'
66
end

pom.rb

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

33
project 'jruby_art', 'https://github.com/ruby-processing/JRubyArt' do
44
model_version '4.0.0'
5-
id 'ruby-processing:jruby_art:2.3.0'
5+
id 'ruby-processing:jruby_art:2.4.0'
66
packaging 'jar'
77

88
description 'Jar for JRubyArt'

pom.xml

Lines changed: 1 addition & 1 deletion
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>jruby_art</artifactId>
14-
<version>2.3.0</version>
14+
<version>2.4.0</version>
1515
<name>jruby_art</name>
1616
<description>Jar for JRubyArt</description>
1717
<url>https://github.com/ruby-processing/JRubyArt</url>

0 commit comments

Comments
 (0)