Merge branch 'buster' of https://github.com/ruby-processing/PiCrate into buster

Author: monkstone

Rakefile

@@ -12,7 +12,7 @@ task :init do
   # for Archlinux etc
   # processing_root = File.dirname(`readlink -f $(which processing)`)
   # alternative for debian linux etc
-	processing_root = File.join(HOME_DIR, 'processing-3.5.3')
+  processing_root = File.join(HOME_DIR, 'processing-3.5.3')
   jar_dir = File.join(processing_root, 'core', 'library')
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
@@ -28,7 +28,7 @@ end
 
 desc 'Gem'
 task :gem do
-  system 'gem build picrate.gemspec'
+  system 'jruby -S gem build picrate.gemspec'
 end
 
 desc 'Document'

picrate.gemspec

@@ -30,7 +30,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_development_dependency 'rake', '~> 12.3'
   gem.add_development_dependency 'minitest', '~> 5.10'
-  gem.add_runtime_dependency 'arcball', '~> 1.0.1'
+  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.1'
+  gem.add_runtime_dependency 'geomerative', '~> 1.1'
+  gem.add_runtime_dependency 'ruby_wordcram', '~> 2.0', '>= 2.0.4'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
   gem.requirements << 'java runtime == 11'

pom.rb

@@ -1,11 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-<<<<<<< HEAD
   id 'ruby-processing:picrate:2.0.0.pre'
-=======
-  id 'ruby-processing:picrate:1.2.4'
->>>>>>> 58b677e29000d5a98f8ea81a2e009698a274883f
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -42,15 +38,9 @@
 end
 
 overrides do
-<<<<<<< HEAD
   plugin :resources, '2.7'
   plugin :dependency, '2.8'
   plugin( :compiler, '3.8.1', 'release' => '11' )
-=======
-  plugin :resources, '3.1.0'
-  plugin :dependency, '3.1.1'
-  plugin( :compiler, '3.8.1', 'release' => '8' )
->>>>>>> 58b677e29000d5a98f8ea81a2e009698a274883f
   plugin(
     :javadoc,
     '3.1.1',