geomerative 2.0.0-java → 2.1.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.mvn/extensions.xml +1 -1
  3. data/CHANGELOG.md +3 -0
  4. data/geomerative.gemspec +1 -1
  5. data/lib/geomerative/version.rb +1 -1
  6. data/lib/geomerative.jar +0 -0
  7. data/lib/geomerative.rb +6 -7
  8. data/pom.rb +10 -13
  9. data/pom.xml +6 -13
  10. data/src/module-info.java +4 -0
  11. metadata +7 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 824ce3125f29427f12f918db67abaf3dfb5a5fa74655a68f6578433008a0d920
4
- data.tar.gz: abe6dd8f491f622abb0f28cca3cdbf64376d1d004d32ba78e038fd230a1daa21
3
+ metadata.gz: '04786dbbf9b8106ef82ae2ad79f2c36fcee5d0ebf7241c933b4003fa91f9c3e7'
4
+ data.tar.gz: 5046c57710afc3ba7dc720b885af2aa54ca9a17d438184214821d80dcc4e7269
5
5
  SHA512:
6
- metadata.gz: 4e795f9ab417fcc3c8411d7a4c73ad685c090894ed78c3fe7641cb0c99ff39232bb51b7b3f39e2341852cffd1f2ca3a06717ef5451dfef8cace2d3d45d598db3
7
- data.tar.gz: db4b1c642d340e5776d40f2cb85d1d11593eb713a3021be8fa47bb7c5d1f416fa491533f1cc35b149ec6fb10cff34184e24cd84246c168c59ef0c36b32669adb
6
+ metadata.gz: 9c2149d15a7ab3c73bdc72cb8bd8bfc305fbaa4e37e6e25525a9a4df9d9a937a8a53eb2d2b9d252a5a4bd6c6420333ee2ae525e110377a6048033a095070ac86
7
+ data.tar.gz: 9d9ba11bd6aa4dd617c4c207326d5fbbe98f68de5f2dacbd5039e91db73c7bf262b100c5ecbe04e00a143c9dd49548a53bcdcb7b0f3196042a4349fc5de75eda
data/.mvn/extensions.xml CHANGED
@@ -3,6 +3,6 @@
3
3
  <extension>
4
4
  <groupId>io.takari.polyglot</groupId>
5
5
  <artifactId>polyglot-ruby</artifactId>
6
- <version>0.4.4</version>
6
+ <version>0.4.6</version>
7
7
  </extension>
8
8
  </extensions>
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ ### version-2.1.0
2
+ First crack at java module, and other changes that seem to be necessary for JRuby-3.0+
3
+
1
4
  ### version-2.0.0
2
5
  For jdk11+, for JRubyArt-2.4+, propane-3.6+ and PiCrate-2.1+, remove dependency on PApplet instance method readBytes(String).
3
6
 
data/geomerative.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
20
20
  spec.files << 'lib/geomerative.jar'
21
21
  spec.require_paths = ['lib']
22
- spec.add_development_dependency 'rake', '~> 12.3'
22
+ spec.add_development_dependency 'rake', '~> 13'
23
23
  # spec.add_development_dependency 'maven', '~> 3.3', '>= 3.3.3'
24
24
  spec.platform = 'java'
25
25
  spec.requirements << 'A decent graphics card'
data/lib/geomerative/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Geomerative
2
- VERSION = '2.0.0'
2
+ VERSION = '2.1.0'
3
3
  end
data/lib/geomerative.jar CHANGED
Binary file
data/lib/geomerative.rb CHANGED
@@ -3,11 +3,10 @@ KLASSES = %w[
3
3
  RMesh RPath RPoint RPolygon RRectangle RSVG RShape RStrip RStyle
4
4
  ].freeze
5
5
 
6
- if RUBY_PLATFORM == 'java'
7
- require_relative 'geomerative.jar'
8
- def import_class_list(list, string)
9
- list.each { |klass| java_import format(string, klass) }
10
- end
11
- geom_format = 'geomerative.%s'
12
- import_class_list(KLASSES, geom_format)
6
+
7
+ require 'geomerative.jar'
8
+ def import_class_list(list, string)
9
+ list.each { |klass| java_import format(string, klass) }
13
10
  end
11
+ geom_format = 'geomerative.%s'
12
+ import_class_list(KLASSES, geom_format)
data/pom.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  project 'geomerative' do
2
2
 
3
3
  model_version '4.0.0'
4
- id 'ruby-processing:geomerative:2.0.0'
4
+ id 'ruby-processing:geomerative:2.1.0'
5
5
  packaging 'jar'
6
6
 
7
7
  description 'geomerative-library for JRubyArt'
@@ -22,22 +22,19 @@ project 'geomerative' do
22
22
  :connection => 'scm:git:git://github.com/ruby-processing/geomerative.git',
23
23
  :developer_connection => 'scm:git:git@github.com:ruby-processing/geomerative.git' )
24
24
 
25
- properties( 'maven.compiler.source' => '1.8',
25
+ properties( 'maven.compiler.source' => '11',
26
26
  'project.build.sourceEncoding' => 'UTF-8',
27
- 'maven.compiler.target' => '12',
28
- 'polyglot.dump.pom' => 'pom.xml'
27
+ 'polyglot.dump.pom' => 'pom.xml',
28
+ 'maven.deploy.skip' => 'true'
29
29
  )
30
30
 
31
31
  jar 'org.processing:core:4.0.0'
32
32
 
33
- plugin( :compiler, '3.8.1',
34
- 'release' => '11' )
35
- plugin( :jar, '3.2.0',
36
- 'archive' => {
37
- 'manifestEntries' => {
38
- 'Automatic-Module-Name' => 'geomerative.gem'
39
- }
40
- } )
33
+ plugin(
34
+ :compiler, '3.8.1',
35
+ 'release' => '${maven.compiler.source}'
36
+ )
37
+ plugin(:jar, '3.2.0')
41
38
  plugin :resources, '2.7'
42
39
 
43
40
  build do
@@ -51,7 +48,7 @@ project 'geomerative' do
51
48
  'linkXRef' => 'true',
52
49
  'sourceEncoding' => 'utf-8',
53
50
  'minimumTokens' => '100',
54
- 'targetJdk' => '${maven.compiler.target}' )
51
+ 'targetJdk' => '${maven.compiler.source}' )
55
52
  plugin( :checkstyle, '3.1.0',
56
53
  'configLocation' => 'config/sun_checks.xml' )
57
54
  end
data/pom.xml CHANGED
@@ -2,7 +2,7 @@
2
2
  <!--
3
3
 
4
4
 
5
- DO NOT MODIFIY - GENERATED CODE
5
+ DO NOT MODIFY - GENERATED CODE
6
6
 
7
7
 
8
8
  -->
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
11
11
  <modelVersion>4.0.0</modelVersion>
12
12
  <groupId>ruby-processing</groupId>
13
13
  <artifactId>geomerative</artifactId>
14
- <version>2.0.0</version>
14
+ <version>2.1.0</version>
15
15
  <name>geomerative</name>
16
16
  <description>geomerative-library for JRubyArt</description>
17
17
  <organization>
@@ -44,8 +44,8 @@ DO NOT MODIFIY - GENERATED CODE
44
44
  <url>https://github.com/ruby-processing/geomerative/issues</url>
45
45
  </issueManagement>
46
46
  <properties>
47
- <maven.compiler.source>1.8</maven.compiler.source>
48
- <maven.compiler.target>12</maven.compiler.target>
47
+ <maven.compiler.source>11</maven.compiler.source>
48
+ <maven.deploy.skip>true</maven.deploy.skip>
49
49
  <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
50
50
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
51
51
  </properties>
@@ -65,19 +65,12 @@ DO NOT MODIFIY - GENERATED CODE
65
65
  <artifactId>maven-compiler-plugin</artifactId>
66
66
  <version>3.8.1</version>
67
67
  <configuration>
68
- <release>11</release>
68
+ <release>${maven.compiler.source}</release>
69
69
  </configuration>
70
70
  </plugin>
71
71
  <plugin>
72
72
  <artifactId>maven-jar-plugin</artifactId>
73
73
  <version>3.2.0</version>
74
- <configuration>
75
- <archive>
76
- <manifestEntries>
77
- <Automatic-Module-Name>geomerative.gem</Automatic-Module-Name>
78
- </manifestEntries>
79
- </archive>
80
- </configuration>
81
74
  </plugin>
82
75
  <plugin>
83
76
  <artifactId>maven-resources-plugin</artifactId>
@@ -94,7 +87,7 @@ DO NOT MODIFIY - GENERATED CODE
94
87
  <linkXRef>true</linkXRef>
95
88
  <sourceEncoding>utf-8</sourceEncoding>
96
89
  <minimumTokens>100</minimumTokens>
97
- <targetJdk>${maven.compiler.target}</targetJdk>
90
+ <targetJdk>${maven.compiler.source}</targetJdk>
98
91
  </configuration>
99
92
  </plugin>
100
93
  <plugin>
data/src/module-info.java ADDED
@@ -0,0 +1,4 @@
1
+ module geomerative{
2
+ exports geomerative;
3
+ requires org.processing.core;
4
+ }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geomerative
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.1.0
5
5
  platform: java
6
6
  authors:
7
7
  - Ricard Marxer
@@ -9,22 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-08-20 00:00:00.000000000 Z
12
+ date: 2021-09-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '12.3'
19
+ version: '13'
20
20
  name: rake
21
- type: :development
22
21
  prerelease: false
22
+ type: :development
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - "~>"
26
26
  - !ruby/object:Gem::Version
27
- version: '12.3'
27
+ version: '13'
28
28
  description: |2
29
29
  Geomerative java library wrapped in a rubygem. Updated to use String switch
30
30
  etc available since jdk8, and somewhat hacked see CHANGELOG.
@@ -126,6 +126,7 @@ files:
126
126
  - src/geomerative/RShape.java
127
127
  - src/geomerative/RStrip.java
128
128
  - src/geomerative/RStyle.java
129
+ - src/module-info.java
129
130
  - src/org/apache/batik/svggen/font/Font.java
130
131
  - src/org/apache/batik/svggen/font/Glyph.java
131
132
  - src/org/apache/batik/svggen/font/Point.java
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
219
220
  requirements:
220
221
  - A decent graphics card
221
222
  - java runtime >= 11+
222
- rubygems_version: 3.0.6
223
+ rubygems_version: 3.2.14
223
224
  signing_key:
224
225
  specification_version: 4
225
226
  summary: Updated geomerative library for JRubyArt