geomerative 2.0.0-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824ce3125f29427f12f918db67abaf3dfb5a5fa74655a68f6578433008a0d920
-  data.tar.gz: abe6dd8f491f622abb0f28cca3cdbf64376d1d004d32ba78e038fd230a1daa21
+  metadata.gz: '04786dbbf9b8106ef82ae2ad79f2c36fcee5d0ebf7241c933b4003fa91f9c3e7'
+  data.tar.gz: 5046c57710afc3ba7dc720b885af2aa54ca9a17d438184214821d80dcc4e7269
 SHA512:
-  metadata.gz: 4e795f9ab417fcc3c8411d7a4c73ad685c090894ed78c3fe7641cb0c99ff39232bb51b7b3f39e2341852cffd1f2ca3a06717ef5451dfef8cace2d3d45d598db3
-  data.tar.gz: db4b1c642d340e5776d40f2cb85d1d11593eb713a3021be8fa47bb7c5d1f416fa491533f1cc35b149ec6fb10cff34184e24cd84246c168c59ef0c36b32669adb
+  metadata.gz: 9c2149d15a7ab3c73bdc72cb8bd8bfc305fbaa4e37e6e25525a9a4df9d9a937a8a53eb2d2b9d252a5a4bd6c6420333ee2ae525e110377a6048033a095070ac86
+  data.tar.gz: 9d9ba11bd6aa4dd617c4c207326d5fbbe98f68de5f2dacbd5039e91db73c7bf262b100c5ecbe04e00a143c9dd49548a53bcdcb7b0f3196042a4349fc5de75eda

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.6</version>
   </extension>
 </extensions>

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### version-2.1.0
+First crack at java module, and other changes that seem to be necessary for JRuby-3.0+
+
 ### version-2.0.0
 For jdk11+, for JRubyArt-2.4+, propane-3.6+ and PiCrate-2.1+, remove dependency on PApplet instance method readBytes(String).
 

data/geomerative.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/geomerative.jar'
   spec.require_paths = ['lib']
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13'
   # spec.add_development_dependency 'maven', '~> 3.3', '>= 3.3.3'
   spec.platform = 'java'
   spec.requirements << 'A decent graphics card'

data/lib/geomerative/version.rb

@@ -1,3 +1,3 @@
 module Geomerative
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/geomerative.rb

@@ -3,11 +3,10 @@ KLASSES = %w[
   RMesh RPath RPoint RPolygon RRectangle RSVG RShape RStrip RStyle
 ].freeze
 
-if RUBY_PLATFORM == 'java'
-  require_relative 'geomerative.jar'
-  def import_class_list(list, string)
-    list.each { |klass| java_import format(string, klass) }
-  end
-  geom_format = 'geomerative.%s'
-  import_class_list(KLASSES, geom_format)
+
+require 'geomerative.jar'
+def import_class_list(list, string)
+  list.each { |klass| java_import format(string, klass) }
 end
+geom_format = 'geomerative.%s'
+import_class_list(KLASSES, geom_format)

data/pom.rb

@@ -1,7 +1,7 @@
 project 'geomerative' do
 
   model_version '4.0.0'
-  id 'ruby-processing:geomerative:2.0.0'
+  id 'ruby-processing:geomerative:2.1.0'
   packaging 'jar'
 
   description 'geomerative-library for JRubyArt'
@@ -22,22 +22,19 @@ project 'geomerative' do
                   :connection => 'scm:git:git://github.com/ruby-processing/geomerative.git',
                   :developer_connection => 'scm:git:git@github.com:ruby-processing/geomerative.git' )
 
-  properties( 'maven.compiler.source' => '1.8',
+  properties( 'maven.compiler.source' => '11',
               'project.build.sourceEncoding' => 'UTF-8',
-              'maven.compiler.target' => '12',
-              'polyglot.dump.pom' => 'pom.xml'
+              'polyglot.dump.pom' => 'pom.xml',
+              'maven.deploy.skip' => 'true'
             )
 
   jar 'org.processing:core:4.0.0'
 
-  plugin( :compiler, '3.8.1',
-          'release' =>  '11' )
-          plugin( :jar, '3.2.0',
-            'archive' => {
-              'manifestEntries' => {
-                'Automatic-Module-Name' =>  'geomerative.gem'
-              }
-              } )
+  plugin(
+         :compiler, '3.8.1',
+         'release' => '${maven.compiler.source}'
+        )
+  plugin(:jar, '3.2.0')
   plugin :resources, '2.7'
 
   build do
@@ -51,7 +48,7 @@ project 'geomerative' do
       'linkXRef' =>  'true',
       'sourceEncoding' =>  'utf-8',
       'minimumTokens' =>  '100',
-      'targetJdk' => '${maven.compiler.target}' )
+      'targetJdk' => '${maven.compiler.source}' )
     plugin( :checkstyle, '3.1.0',
       'configLocation' =>  'config/sun_checks.xml' )
   end

data/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>geomerative</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <name>geomerative</name>
   <description>geomerative-library for JRubyArt</description>
   <organization>
@@ -44,8 +44,8 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/geomerative/issues</url>
   </issueManagement>
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>12</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.deploy.skip>true</maven.deploy.skip>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -65,19 +65,12 @@ DO NOT MODIFIY - GENERATED CODE
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <release>11</release>
+          <release>${maven.compiler.source}</release>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <version>3.2.0</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Automatic-Module-Name>geomerative.gem</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
@@ -94,7 +87,7 @@ DO NOT MODIFIY - GENERATED CODE
           <linkXRef>true</linkXRef>
           <sourceEncoding>utf-8</sourceEncoding>
           <minimumTokens>100</minimumTokens>
-          <targetJdk>${maven.compiler.target}</targetJdk>
+          <targetJdk>${maven.compiler.source}</targetJdk>
         </configuration>
       </plugin>
       <plugin>

data/src/module-info.java

@@ -0,0 +1,4 @@
+module geomerative{
+  exports geomerative;
+  requires org.processing.core;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geomerative
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: java
 authors:
 - Ricard Marxer
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13'
   name: rake
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13'
 description: |2
     Geomerative java library wrapped in a rubygem. Updated to use String switch
     etc available since jdk8, and somewhat hacked see CHANGELOG.
@@ -126,6 +126,7 @@ files:
 - src/geomerative/RShape.java
 - src/geomerative/RStrip.java
 - src/geomerative/RStyle.java
+- src/module-info.java
 - src/org/apache/batik/svggen/font/Font.java
 - src/org/apache/batik/svggen/font/Glyph.java
 - src/org/apache/batik/svggen/font/Point.java
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 11+
-rubygems_version: 3.0.6
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: Updated geomerative library for JRubyArt