Skip to content

Commit 12023a8

Browse files
committed
java 8 stuff
1 parent f7c6338 commit 12023a8

File tree

7 files changed

+228
-186
lines changed

7 files changed

+228
-186
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/test/version_tmp/
1111
/tmp/
1212
*~
13+
*.swp
1314
*.jar
1415
target
1516
# Used by dotenv library to load environment variables.

Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
# Specify your gem's dependencies in jruby_art.gemspec
4+
gemspec
5+
6+

joonsrenderer.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
88
gem.version = JoonsRenderer::VERSION
99
gem.authors = ['monkstone']
1010
gem.email = ['mamba2928@yahoo.co.uk']
11-
gem.licenses = %w(GPL-3.0 LGPL-2.0)
11+
gem.licenses = %w(GPL-3.0)
1212
gem.description = %q{A realistic ray tracer for propane and JRubyArt}
1313
gem.summary = %q{From Sketch to Ray Traced Image}
1414
gem.homepage = 'https://ruby-processing.github.io/propane/'

pom.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'fileutils'
12
project 'joonsrenderer' do
23

34
model_version '4.0.0'
@@ -29,11 +30,14 @@
2930
jar 'org.processing:core:${processing.version}'
3031
jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
3132
jar 'org.jogamp.gluegen:gluegen-rt:${jogl.version}'
33+
jar('org.codehaus.janino:commons-compiler:${janino.version}')
34+
jar('org.codehaus.janino:janino:${janino.version}')
3235

3336
overrides do
3437
plugin :resources, '2.6'
3538
plugin :dependency, '2.10' do
36-
execute_goals( id: 'default-cli',
39+
execute_goals( id: 'maven-dependency-plugin',
40+
goal: 'copy-dependencies',
3741
artifactItems: [
3842
{ groupId: 'org.codehaus.janino',
3943
artifactId: 'janino',

pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,16 @@ DO NOT MODIFIY - GENERATED CODE
9090
<artifactId>gluegen-rt</artifactId>
9191
<version>${jogl.version}</version>
9292
</dependency>
93+
<dependency>
94+
<groupId>org.codehaus.janino</groupId>
95+
<artifactId>commons-compiler</artifactId>
96+
<version>${janino.version}</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.codehaus.janino</groupId>
100+
<artifactId>janino</artifactId>
101+
<version>${janino.version}</version>
102+
</dependency>
93103
</dependencies>
94104
<build>
95105
<sourceDirectory>src</sourceDirectory>
@@ -106,8 +116,9 @@ DO NOT MODIFIY - GENERATED CODE
106116
<version>2.10</version>
107117
<executions>
108118
<execution>
109-
<id>default-cli</id>
119+
<id>maven-dependency-plugin</id>
110120
<configuration>
121+
<goal>copy-dependencies</goal>
111122
<artifactItems>
112123
<artifactItem>
113124
<groupId>org.codehaus.janino</groupId>

0 commit comments

Comments
 (0)