bump to compile with jdk12

Author: monkstone

.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 sudo: false
 
-rvm: 
-  - jruby-9.1.6.0
+rvm:
+  - jruby-9.2.8.0
 jdk:
-  - oraclejdk8
+  - openjdk11
 os:
   - linux
-

CHANGELOG.md

@@ -1,3 +1,5 @@
+**v2.0.0** Bump to jdk12 and fix code 
+
 **v1.0.1** Bump processing to 3.4, support toxiclibs Voronoi etc
 
 **v1.0.0** About time we got to 1.0.0 bump processing to 3.3.4

examples/boolean_shapes.rb

@@ -13,7 +13,7 @@
 
 def setup
   sketch_title 'Boolean Shapes'
-  @gfx = Gfx::ToxiclibsSupport.new(self)
+  @gfx = Gfx::ToxiclibsSupport.new(self, self.g)
   @bool = KEY.zip(TYPE).to_h
   control_panel do |c|
     c.title = 'Union or XOR'

lib/toxiclibs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # wrapper to give version a meaningful name
 module Toxiclibs
-  VERSION = '1.0.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

pom.rb

@@ -1,7 +1,7 @@
 project 'toxiclibs' do
 
   model_version '4.0.0'
-  id 'ruby-processing:toxiclibs:1.0.1'
+  id 'ruby-processing:toxiclibs:2.0.0'
   packaging 'jar'
 
   description 'toxiclibs-library for JRubyArt'
@@ -22,24 +22,24 @@
                   :connection => 'scm:git:git://github.com/ruby-processing/toxiclibs.git',
                   :developer_connection => 'scm:git:[email protected]:ruby-processing/toxiclibs.git' )
 
-  properties( 'maven.compiler.source' => '1.8',
+  properties( 'target.release' => '11',
               'project.build.sourceEncoding' => 'UTF-8',
               'maven.compiler.target' => '1.8',
               'polyglot.dump.pom' => 'pom.xml'
             )
 
   jar 'args4j:args4j:2.0.31'
   jar 'org.processing:core:3.3.7'
+  jar 'javax.xml.bind:jaxb-api:2.3.0'
 
-  plugin( :compiler, '3.8.0',
-          'source' =>  '1.8',
-          'target' =>  '1.8' )
-  plugin( :jar, '3.0.2',
+  plugin( :compiler, '3.8.1',
+          'release' =>  '${target.release}' )
+  plugin( :jar, '3.1.1',
           'archive' => {
             'manifestFile' =>  'MANIFEST.MF'
           } )
-  plugin :resources, '3.0.2'
-  plugin :dependency, '3.0.2' do
+  plugin :resources, '3.1.0'
+  plugin :dependency, '3.1.1' do
     execute_goals( :id => 'default-cli',
                    'artifactItems' => [ { 'groupId' =>  'args4j',
                                           'artifactId' =>  'args4j',

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>1.0.1</version>
+  <version>2.0.0</version>
   <name>toxiclibs</name>
   <description>toxiclibs-library for JRubyArt</description>
   <organization>
@@ -44,10 +44,10 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/toxiclibs/issues</url>
   </issueManagement>
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <target.release>11</target.release>
   </properties>
   <dependencies>
     <dependency>
@@ -60,6 +60,11 @@ DO NOT MODIFIY - GENERATED CODE
       <artifactId>core</artifactId>
       <version>3.3.7</version>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>
@@ -68,15 +73,14 @@ DO NOT MODIFIY - GENERATED CODE
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <release>${target.release}</release>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.1</version>
         <configuration>
           <archive>
             <manifestFile>MANIFEST.MF</manifestFile>
@@ -85,11 +89,11 @@ DO NOT MODIFIY - GENERATED CODE
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.1</version>
         <executions>
           <execution>
             <id>default-cli</id>

src/toxi/data/feeds/util/Iso8601DateAdapter.java

@@ -36,7 +36,7 @@
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+//import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
 
 /**
  *
@@ -73,7 +73,7 @@ public String marshal(XMLGregorianCalendar date) throws Exception {
     public XMLGregorianCalendar unmarshal(String dateString) throws Exception {
         XMLGregorianCalendar calendar = null;
         GregorianCalendar cal = new GregorianCalendar();
-        DatatypeFactory dataType = DatatypeFactoryImpl.newInstance();
+        DatatypeFactory dataType = DatatypeFactory.newInstance();
         for (SimpleDateFormat f : ISO8601_FORMATS) {
             try {
                 Date d = f.parse(dateString);

src/toxi/data/feeds/util/Rfc822DateAdapter.java

@@ -36,7 +36,7 @@
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+//import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
 
 /**
  *
@@ -82,7 +82,7 @@ public XMLGregorianCalendar unmarshal(String dateString) throws Exception {
             try {
                 Date d = f.parse(dateString);
                 cal.setTime(d);
-                DatatypeFactory dataType = DatatypeFactoryImpl.newInstance();
+                DatatypeFactory dataType = DatatypeFactory.newInstance();
                 calendar = dataType.newXMLGregorianCalendar(cal);
                 break;
             } catch (ParseException e) {