Skip to content

Commit 09f14f7

Browse files
committed
Spring clean
1 parent 194111a commit 09f14f7

File tree

9 files changed

+81
-77
lines changed

9 files changed

+81
-77
lines changed

.mvn/extensions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<extension>
44
<groupId>io.takari.polyglot</groupId>
55
<artifactId>polyglot-ruby</artifactId>
6-
<version>0.3.0
7-
</version>
6+
<version>0.4.3</version>
87
</extension>
98
</extensions>
9+

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar

README.md

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,35 @@
11
# ArcBall
22
ArcBall functionality for processing (ruby versions) as gem
33

4-
### Example Usage
5-
The sketch class need to to inherit from PApplet to work and self should return such an instance. The following is a ruby-processing example, which currently supplies arcball via a library, but gem distribution has its attractions. Drag mouse to rotate. Hold down 'x', 'y' or 'z' keys to constrain axis of rotation, mouse-wheel to zoom.
4+
### Example Usage
5+
The sketch class need to to inherit from PApplet to work and self should return such an instance. The following is a propane example. Drag mouse to rotate. Hold down 'x', 'y' or 'z' keys to constrain axis of rotation, mouse-wheel to zoom.
66

77
```ruby
8-
require 'arcball'
8+
class ArcBallBox < Propane::App
9+
############################
10+
# Use mouse drag to rotate
11+
# the arcball. Use mousewheel
12+
# to zoom. Hold down x, y, z
13+
# to constrain rotation axis.
14+
############################
15+
def setup
16+
sketch_title 'Arcball Box'
17+
Processing::ArcBall.init self, 300, 300
18+
fill 180
19+
end
920

10-
def setup
11-
size(600, 600, P3D)
12-
smooth(8)
13-
Processing::ArcBall.init(self, 300, 300)
14-
fill 180
15-
end
21+
def draw
22+
background 50
23+
box 300, 300, 300
24+
end
1625

17-
def draw
18-
background(50)
19-
box(300, 300, 300)
26+
def settings
27+
size 600, 600, P3D
28+
smooth 8
29+
end
2030
end
31+
32+
ArcBallBox.new
2133
```
2234
Since version 0.0.2, you can also fix rotation to one axis at initialization
2335

Rakefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# encoding: utf-8
21
# frozen_string_literal: false
2+
33
require_relative 'lib/arcball/version'
44

55
def create_manifest
@@ -11,7 +11,7 @@ def create_manifest
1111
end
1212
end
1313

14-
task default: [:init, :compile, :install, :gem]
14+
task default: %i[init compile install gem]
1515

1616
desc 'Create Manifest'
1717
task :init do
@@ -20,28 +20,28 @@ end
2020

2121
desc 'Build gem'
2222
task :gem do
23-
sh 'gem build arcball.gemspec'
23+
system 'gem build arcball.gemspec'
2424
end
2525

2626
desc 'Install'
2727
task :install do
28-
sh 'mv target/arcball.jar lib'
28+
system 'mv target/arcball.jar lib'
2929
end
3030

3131
desc 'Document'
3232
task :javadoc do
33-
sh 'mvn javadoc:javadoc'
33+
system '.mvnw javadoc:javadoc'
3434
end
3535

3636
desc 'Compile'
3737
task :compile do
38-
sh 'mvn package'
38+
system '.mvnw package'
3939
end
4040

4141
desc 'clean'
4242
task :clean do
4343
Dir['./**/*.%w{jar gem}'].each do |path|
44-
puts 'Deleting #{path} ...'
44+
puts "Deleting #{path} ..."
4545
File.delete(path)
4646
end
4747
FileUtils.rm_rf('./target')

arcball.gemspec

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ Gem::Specification.new do |s|
66
s.name = 'arcball'
77
s.version = ArcBall::VERSION
88
s.licenses = ['GPL-3.0']
9-
s.has_rdoc = false
10-
s.extra_rdoc_files = ['README.md', 'LICENSE.md']
119
s.authors = ['Martin Prout']
12-
s.date = %q{2016-03-13}
13-
s.description = %q{A ArcBall in java for propane}
10+
s.date = %q{2020-04-09}
11+
s.description = %q{A ArcBall in java for propane and PiCrate}
1412
s.summary = %q{Provides arcball functionality to processing, from a ruby environment}
15-
s.email = %q{[email protected]}
13+
s.email = %q{[email protected]}
1614
s.files = ['Rakefile', 'lib/arcball.rb', 'lib/arcball.jar', 'lib/arcball/version.rb']
1715
s.homepage = %q{http://rubygems.org/gems/arcball}
1816
s.require_paths = ['lib']
19-
s.add_development_dependency 'rake', '~> 12'
20-
s.platform='java'
21-
s.rubygems_version = %q{2.5.2}
17+
s.add_development_dependency 'rake', '~> 12.3'
18+
s.platform = 'java'
19+
s.requirements << 'java runtime == 8'
2220
end

lib/arcball.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# encoding: utf-8
2-
# frozen_string_literal: false
3-
require 'java'
1+
# frozen_string_literal: true
2+
3+
require 'jruby'
44
require_relative 'arcball.jar'
55
Java::MonkstoneArcball::ArcBallLibrary.load(JRuby.runtime)

lib/arcball/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22
module ArcBall
3-
VERSION = '1.0.1'.freeze
3+
VERSION = '1.0.2'.freeze
44
end

pom.rb

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
# frozen_string_literal: true
2+
13
require 'fileutils'
4+
25
project 'arcball', 'https://github.com/ruby-processing/ArcBall' do
36
model_version '4.0.0'
4-
id 'arcball:arcball', '1.0.1'
7+
id 'arcball:arcball', '1.0.2'
58
packaging 'jar'
69
description 'arcball for arcball'
710
organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -18,37 +21,31 @@
1821
url: 'https://github.com/ruby-processing/ArcBall',
1922
connection: 'scm:git:git://github.com/ruby-processing/ArcBall',
2023
developer_connection: 'scm:git:[email protected]/ruby-processing/ArcBall.git'
21-
)
24+
)
2225

2326
properties('source.directory' => 'src',
24-
'arcball.basedir' => '${project.basedir}',
25-
'polyglot.dump.pom' => 'pom.xml',
26-
'maven.compiler.source' => '1.8',
27-
'project.build.sourceEncoding' => 'utf-8',
28-
'maven.compiler.target' => '1.8',
29-
'jruby.api' => 'http://jruby.org/apidocs/',
30-
'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
31-
'jruby.api' => 'http://jruby.org/apidocs/',
32-
)
33-
34-
pom('org.jruby:jruby:9.1.17.0')
27+
'arcball.basedir' => '${project.basedir}',
28+
'polyglot.dump.pom' => 'pom.xml',
29+
'maven.compiler.source' => '1.8',
30+
'project.build.sourceEncoding' => 'utf-8',
31+
'maven.compiler.target' => '1.8',
32+
'jruby.api' => 'http://jruby.org/apidocs/',
33+
'processing.api' => 'http://processing.github.io/processing-javadocs/core/')
34+
35+
pom('org.jruby:jruby:9.2.11.1')
3536
jar('org.processing:core:3.3.7')
3637

37-
plugin_management do
38-
plugin :resources, '2.6'
39-
plugin :dependency, '2.10'
40-
41-
plugin( :compiler, '3.7.0',
42-
source: '${maven.compiler.source}',
43-
target: '${maven.compiler.target}'
44-
)
45-
plugin( :javadoc, '2.10.4',
46-
detect_offline_links: 'false',
47-
links: ['${jruby.api}', '${processing.api}']
48-
)
49-
plugin( :jar, '3.0.2',
50-
archive: { manifestFile: 'MANIFEST.MF' }
51-
)
38+
overrides do
39+
plugin :dependency, '3.1.2'
40+
plugin(:compiler, '3.8.1',
41+
source: '${maven.compiler.source}',
42+
target: '${maven.compiler.target}')
43+
plugin(:javadoc, '2.10.4',
44+
'detectOfflineLinks' => 'false',
45+
'links' => ['${processing.api}',
46+
'${jruby.api}'])
47+
plugin(:jar, '3.2.0',
48+
archive: { manifestFile: 'MANIFEST.MF' })
5249
end
5350

5451
build do

pom.xml

Lines changed: 11 additions & 15 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>arcball</groupId>
1313
<artifactId>arcball</artifactId>
14-
<version>1.0.1</version>
14+
<version>1.0.2</version>
1515
<name>arcball</name>
1616
<description>arcball for arcball</description>
1717
<url>https://github.com/ruby-processing/ArcBall</url>
@@ -38,20 +38,20 @@ DO NOT MODIFIY - GENERATED CODE
3838
<url>https://github.com/monkstone/arcball/issues</url>
3939
</issueManagement>
4040
<properties>
41-
<processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
42-
<source.directory>src</source.directory>
43-
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
4441
<arcball.basedir>${project.basedir}</arcball.basedir>
45-
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
46-
<maven.compiler.source>1.8</maven.compiler.source>
4742
<jruby.api>http://jruby.org/apidocs/</jruby.api>
43+
<maven.compiler.source>1.8</maven.compiler.source>
4844
<maven.compiler.target>1.8</maven.compiler.target>
45+
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
46+
<processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
47+
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
48+
<source.directory>src</source.directory>
4949
</properties>
5050
<dependencies>
5151
<dependency>
5252
<groupId>org.jruby</groupId>
5353
<artifactId>jruby</artifactId>
54-
<version>9.1.17.0</version>
54+
<version>9.2.11.1</version>
5555
<type>pom</type>
5656
</dependency>
5757
<dependency>
@@ -66,17 +66,13 @@ DO NOT MODIFIY - GENERATED CODE
6666
<finalName>arcball</finalName>
6767
<pluginManagement>
6868
<plugins>
69-
<plugin>
70-
<artifactId>maven-resources-plugin</artifactId>
71-
<version>2.6</version>
72-
</plugin>
7369
<plugin>
7470
<artifactId>maven-dependency-plugin</artifactId>
75-
<version>2.10</version>
71+
<version>3.1.2</version>
7672
</plugin>
7773
<plugin>
7874
<artifactId>maven-compiler-plugin</artifactId>
79-
<version>3.7.0</version>
75+
<version>3.8.1</version>
8076
<configuration>
8177
<source>${maven.compiler.source}</source>
8278
<target>${maven.compiler.target}</target>
@@ -88,14 +84,14 @@ DO NOT MODIFIY - GENERATED CODE
8884
<configuration>
8985
<detectOfflineLinks>false</detectOfflineLinks>
9086
<links>
91-
<link>${jruby.api}</link>
9287
<link>${processing.api}</link>
88+
<link>${jruby.api}</link>
9389
</links>
9490
</configuration>
9591
</plugin>
9692
<plugin>
9793
<artifactId>maven-jar-plugin</artifactId>
98-
<version>3.0.2</version>
94+
<version>3.2.0</version>
9995
<configuration>
10096
<archive>
10197
<manifestFile>MANIFEST.MF</manifestFile>

0 commit comments

Comments
 (0)