Revert "Merge branch 'integrated-core' into master"

This reverts commit 70daaf4, reversing
changes made to 9a0305c.

revert merge

Author: monkstone

README.md

@@ -23,7 +23,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.8.0.pre-java.gem # local install requires a custom processing-core
+jgem install propane-2.6.6-java.gem # local install requires a custom processing-core
 ```
 
 ## Usage

Rakefile

@@ -7,7 +7,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
+    f.puts('Class-Path: processing-core.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 
@@ -21,7 +21,7 @@ end
 desc 'Install'
 task :install do
   sh 'mvn dependency:copy'
-  sh 'mv target/propane-2.8.0.jar lib'
+  sh 'mv target/propane.jar lib'
 end
 
 desc 'Gem'

lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.8.0.pre'.freeze
+  VERSION = '2.7.1'.freeze
 end

library/control_panel/control_panel.rb

@@ -9,6 +9,7 @@ def self.app_value(name, val)
   end
 
   # class used to create slider elements for control_panel
+  class Slider < javax.swing.JSlider
     def initialize(control_panel, name, range, initial, proc = nil)
       min = range.begin * 100
       mx = range.end

pom.rb

@@ -1,109 +1,107 @@
-project 'propane', 'http://maven.apache.org' do
-
+require 'fileutils'
+project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'ruby-processing:propane:2.8.0'
+  id 'propane:propane', '2.7.1'
   packaging 'jar'
-
-  description 'Processing core is the engine that drives processing, this is a hacked version for propane (a ruby version).'
-
+  description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
-
-  {
-    'monkstone' => 'Martin Prout', 'benfry' => 'Ben Fry',
-    'REAS' => 'Casey Reas', 'codeanticode' => 'Andres Colubri'
-  }.each do |key, value|
+  { 'monkstone' => 'Martin Prout' }.each do |key, value|
     developer key do
       name value
       roles 'developer'
     end
   end
   license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'
-  license 'LGPL 2', 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html'
-
   issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
 
-  properties( 'jogl.version' => '2.3.2',
-    'jruby.api' => 'http://jruby.org/apidocs/',
-    'source.directory' => 'src',
-    'maven.compiler.target' => '1.8',
-    'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
+  source_control(
+    url: 'https://github.com/ruby-processing/propane',
+    connection: 'scm:git:git://github.com/ruby-processing/propane.git',
+    developer_connection: 'scm:git:[email protected]/ruby-processing/propane.git'
+    )
+
+  properties('source.directory' => 'src',
     'propane.basedir' => '${project.basedir}',
-    'project.build.sourceEncoding' => 'utf-8',
     'polyglot.dump.pom' => 'pom.xml',
-    'maven.compiler.source' => '1.8' )
-    pom 'org.jruby:jruby:9.1.16.0'
-    jar 'org.processing:video:3.0.2'
-    jar 'com.apple.eawt:apple:1.0'
-    jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
-    jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
+    'maven.compiler.source' => '1.8',
+    'project.build.sourceEncoding' => 'utf-8',
+    'maven.compiler.target' => '1.8',
+    'jruby.api' => 'http://jruby.org/apidocs/',
+    'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
+    'jruby.api' => 'http://jruby.org/apidocs/',
+    'jogl.version' => '2.3.2'
+    )
 
-    overrides do
-      plugin :resources, '2.6'
-      plugin :dependency, '2.10' do
-        execute_goals( id: 'default-cli',
-          artifactItems: [ { groupId:  'org.jogamp.jogl',
-            artifactId:  'jogl-all',
-            version:  '${jogl.version}',
-            type:  'jar',
-            outputDirectory: '${propane.basedir}/lib'
-          },
-          { groupId:  'org.jogamp.gluegen',
-            artifactId:  'gluegen-rt',
-            version:  '${jogl.version}',
-            type:  'jar',
-            outputDirectory: '${propane.basedir}/lib'
-          },
-          { groupId:  'org.jogamp.jogl',
-            artifactId:  'jogl-all',
-            version:  '${jogl.version}',
-            classifier: 'natives-linux-amd64',
-            type:  'jar',
-            outputDirectory: '${propane.basedir}/lib'
-          },
-          { groupId:  'org.jogamp.gluegen',
-            artifactId:  'gluegen-rt',
-            version:  '${jogl.version}',
-            type:  'jar',
-            classifier: 'natives-linux-amd64',
-            outputDirectory: '${propane.basedir}/lib'
-          },
-          { groupId:  'org.jogamp.jogl',
-            artifactId:  'jogl-all',
-            version:  '${jogl.version}',
-            classifier: 'natives-macosx-universal',
-            type:  'jar',
-            outputDirectory: '${propane.basedir}/lib'
-          },
-          { groupId:  'org.jogamp.gluegen',
-            artifactId:  'gluegen-rt',
-            version:  '${jogl.version}',
-            type:  'jar',
-            classifier: 'natives-macosx-universal',
-            outputDirectory: '${propane.basedir}/lib'
-          }
+  pom 'org.jruby:jruby:9.1.16.0'
+  jar 'org.processing:core:3.3.7'
+  jar 'org.processing:video:3.0.2'
+  jar('org.jogamp.jogl:jogl-all:${jogl.version}')
+  jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
+
+  overrides do
+    plugin :resources, '2.6'
+    plugin :dependency, '2.10' do
+      execute_goals( id: 'default-cli',
+        artifactItems: [ { groupId:  'org.jogamp.jogl',
+          artifactId:  'jogl-all',
+          version:  '${jogl.version}',
+          type:  'jar',
+          outputDirectory: '${propane.basedir}/lib'
+        },
+        { groupId:  'org.jogamp.gluegen',
+          artifactId:  'gluegen-rt',
+          version:  '${jogl.version}',
+          type:  'jar',
+          outputDirectory: '${propane.basedir}/lib'
+        },
+        { groupId:  'org.jogamp.jogl',
+          artifactId:  'jogl-all',
+          version:  '${jogl.version}',
+          classifier: 'natives-linux-amd64',
+          type:  'jar',
+          outputDirectory: '${propane.basedir}/lib'
+        },
+        { groupId:  'org.jogamp.gluegen',
+          artifactId:  'gluegen-rt',
+          version:  '${jogl.version}',
+          type:  'jar',
+          classifier: 'natives-linux-amd64',
+          outputDirectory: '${propane.basedir}/lib'
+        },
+        { groupId:  'org.jogamp.jogl',
+          artifactId:  'jogl-all',
+          version:  '${jogl.version}',
+          classifier: 'natives-macosx-universal',
+          type:  'jar',
+          outputDirectory: '${propane.basedir}/lib'
+        },
+        { groupId:  'org.jogamp.gluegen',
+          artifactId:  'gluegen-rt',
+          version:  '${jogl.version}',
+          type:  'jar',
+          classifier: 'natives-macosx-universal',
+          outputDirectory: '${propane.basedir}/lib'
+        }
         ]
       )
     end
-  end
 
-  plugin( :resources, '2.7',
-    'encoding' =>  'UTF-8' )
     plugin( :compiler, '3.7.0',
-      'source' =>  '1.8',
-      'target' =>  '1.8' )
-      plugin( :pmd, '3.3',
-        'sourceEncoding' =>  'utf-8',
-        'minimumTokens' =>  '100',
-        'targetJdk' =>  '${compileSource}' )
-        build do
-          resource do
-            directory '${source.directory}/main/java'
-            includes ['**/**/*.glsl', '**/*.jnilib']
-            excludes '**/**/*.java'
-          end
-          resource do
-            directory '${source.directory}/main/resources'
-            includes ['**/*.png', '*.txt']
-          end
-        end
-      end
+      source: '${maven.compiler.source}',
+      target: '${maven.compiler.target}'
+    )
+    plugin( :javadoc, '2.10.4',
+      detect_offline_links:  'false',
+      links: ['${jruby.api}', '${processing.api}']
+    )
+    plugin( :jar, '3.0.2',
+      archive: { manifestFile: 'MANIFEST.MF' }
+    )
+  end
+
+  build do
+    default_goal 'package'
+    source_directory 'src'
+    final_name 'propane'
+  end
+end