Skip to content

Commit 22645a2

Browse files
committed
Clean up and fix
1 parent 34c1761 commit 22645a2

File tree

7 files changed

+45
-80
lines changed

7 files changed

+45
-80
lines changed

Rakefile

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

33
require_relative 'lib/arcball/version'
44

5-
def create_manifest
6-
title = 'Implementation-Title: ArcBall (java extension for jruby)'
7-
version = format('Implementation-Version: %s', ArcBall::VERSION)
8-
File.open('MANIFEST.MF', 'w') do |f|
9-
f.puts(title)
10-
f.puts(version)
11-
end
12-
end
13-
14-
task default: %i[init compile install gem]
15-
16-
desc 'Create Manifest'
17-
task :init do
18-
create_manifest
19-
end
5+
task default: %i[compile install gem]
206

217
desc 'Build gem'
228
task :gem do

arcball.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
77
s.version = ArcBall::VERSION
88
s.licenses = ['GPL-3.0']
99
s.authors = ['Martin Prout']
10-
s.date = %q{2021-04-11}
10+
s.date = %q{2021-09-17}
1111
s.description = %q{A ArcBall in java for propane and PiCrate}
1212
s.summary = %q{Provides arcball functionality to processing, from a ruby environment}
1313
s.email = %q{mamba2928@yahoo.co.uk}

lib/arcball/arcball.rb

Lines changed: 0 additions & 12 deletions
This file was deleted.

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.1.0'.freeze
3+
VERSION = '1.2.0'.freeze
44
end

pom.rb

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
project 'arcball', 'https://github.com/ruby-processing/ArcBall' do
66
model_version '4.0.0'
7-
id 'arcball:arcball', '1.1.0'
7+
id 'arcball:arcball', '1.2.0'
88
packaging 'jar'
99
description 'arcball for arcball'
1010
organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -24,30 +24,40 @@
2424
)
2525

2626
properties('source.directory' => 'src',
27-
'arcball.basedir' => '${project.basedir}',
28-
'polyglot.dump.pom' => 'pom.xml',
29-
'project.build.sourceEncoding' => 'utf-8',
30-
'jruby.api' => 'http://jruby.org/apidocs/',
31-
'processing.api' => 'http://processing.github.io/processing-javadocs/core/')
32-
33-
pom('org.jruby:jruby:9.2.17.0')
34-
jar('org.processing:core:3.3.7')
35-
36-
overrides do
37-
plugin :dependency, '3.1.2'
38-
plugin(:compiler, '3.8.1',
39-
'release' => '11')
40-
plugin(:javadoc, '2.10.4',
41-
'detectOfflineLinks' => 'false',
42-
'links' => ['${processing.api}',
43-
'${jruby.api}'])
44-
plugin(:jar, '3.2.0',
45-
archive: { manifestFile: 'MANIFEST.MF' })
46-
end
27+
'arcball.basedir' => '${project.basedir}',
28+
'polyglot.dump.pom' => 'pom.xml',
29+
'project.build.sourceEncoding' => 'utf-8',
30+
'jruby.api' => 'http://jruby.org/apidocs/',
31+
'processing.api' => 'http://processing.github.io/processing-javadocs/core/')
32+
33+
pom('org.jruby:jruby:9.2.19.0')
34+
jar('org.processing:core:4.0.0')
35+
36+
overrides do
37+
plugin :dependency, '3.1.2'
38+
plugin(
39+
:compiler, '3.8.1',
40+
'release' => '11'
41+
)
42+
plugin(
43+
:javadoc, '2.10.4',
44+
'detectOfflineLinks' => 'false',
45+
'links' => ['${processing.api}',
46+
'${jruby.api}']
47+
)
48+
plugin(
49+
:jar, '3.2.0',
50+
'archive' => {
51+
'manifestEntries' => {
52+
'Automatic-Module-Name' => 'monkstone.arcball'
53+
}
54+
}
55+
)
56+
end
4757

48-
build do
49-
default_goal 'package'
50-
source_directory 'src'
51-
final_name 'arcball'
58+
build do
59+
default_goal 'package'
60+
source_directory 'src'
61+
final_name 'arcball'
62+
end
5263
end
53-
end

pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>arcball</groupId>
1313
<artifactId>arcball</artifactId>
14-
<version>1.1.0</version>
14+
<version>1.1.1</version>
1515
<name>arcball</name>
1616
<description>arcball for arcball</description>
1717
<url>https://github.com/ruby-processing/ArcBall</url>
@@ -49,13 +49,13 @@ DO NOT MODIFY - GENERATED CODE
4949
<dependency>
5050
<groupId>org.jruby</groupId>
5151
<artifactId>jruby</artifactId>
52-
<version>9.2.17.0</version>
52+
<version>9.2.19.0</version>
5353
<type>pom</type>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.processing</groupId>
5757
<artifactId>core</artifactId>
58-
<version>3.3.7</version>
58+
<version>4.0.0</version>
5959
</dependency>
6060
</dependencies>
6161
<build>
@@ -91,7 +91,9 @@ DO NOT MODIFY - GENERATED CODE
9191
<version>3.2.0</version>
9292
<configuration>
9393
<archive>
94-
<manifestFile>MANIFEST.MF</manifestFile>
94+
<manifestEntries>
95+
<Automatic-Module-Name>monkstone.arcball</Automatic-Module-Name>
96+
</manifestEntries>
9597
</archive>
9698
</configuration>
9799
</plugin>

src/monkstone/arcball/package-info.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)