diff --git a/CHANGELOG.md b/CHANGELOG.md index b3eb7c1..bca8bcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +**v1.3.1** Bump for janino-3.1.3 and processing-4.0 + **v1.3.0** Bump for janino-3.1.2, and jdk11 **v1.2.0** Bump for janino-3.0.12, plus some refactoring diff --git a/Rakefile b/Rakefile index 6680a1f..6b7bbb2 100644 --- a/Rakefile +++ b/Rakefile @@ -6,7 +6,7 @@ def create_manifest file = File.open('MANIFEST.MF', 'w') do |f| f.puts(title) f.puts(version) - f.puts('Class-Path: janino-3.1.2.jar commons-compiler-3.1.2.jar') + f.puts('Class-Path: janino-3.1.3.jar commons-compiler-3.1.3.jar') end end diff --git a/joonsrenderer.gemspec b/joonsrenderer.gemspec index f9d4778..d2efcd2 100644 --- a/joonsrenderer.gemspec +++ b/joonsrenderer.gemspec @@ -14,8 +14,8 @@ Gem::Specification.new do |gem| gem.homepage = 'https://ruby-processing.github.io/joonsrenderer/' gem.files = `git ls-files`.split($/) gem.files << 'lib/joonsrenderer.jar' - gem.files << 'lib/janino-3.1.2.jar' - gem.files << 'lib/commons-compiler-3.1.2.jar' + gem.files << 'lib/janino-3.1.3.jar' + gem.files << 'lib/commons-compiler-3.1.3.jar' gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) } gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ['lib'] diff --git a/lib/joonsrenderer/version.rb b/lib/joonsrenderer/version.rb index f35efe1..09dc082 100644 --- a/lib/joonsrenderer/version.rb +++ b/lib/joonsrenderer/version.rb @@ -1,3 +1,3 @@ module JoonsRenderer - VERSION = '1.3.0' + VERSION = '1.3.1' end diff --git a/pom.rb b/pom.rb index 1d6fc50..e2a4962 100644 --- a/pom.rb +++ b/pom.rb @@ -19,7 +19,7 @@ 'joonsrenderer.basedir' => '${project.basedir}', 'polyglot.dump.pom' => 'pom.xml', 'project.build.sourceEncoding' => 'utf-8', - 'janino.version' => '3.1.2', + 'janino.version' => '3.1.3', 'jogl.version' => '2.3.2', 'processing.version' => '3.3.7' ) @@ -56,10 +56,12 @@ 'detectOfflineLinks' => 'false', 'links' => ['${processing.api}', '${jruby.api}']) - plugin(:jar, '3.2.0', - 'archive' => { - 'manifestFile' => 'MANIFEST.MF' - }) + plugin(:jar, '3.2.0', + 'archive' => { + 'manifestEntries' => { + 'Automatic-Module-Name' => 'joonsrenderer' + } + }) plugin :jdeps, '3.1.2' do execute_goals 'jdkinternals', 'test-jdkinternals' end diff --git a/pom.xml b/pom.xml index e967387..4de969b 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ DO NOT MODIFIY - GENERATED CODE https://github.com/monkstone/joonsrenderer/issues - 3.1.2 + 3.1.3 2.3.2 ${project.basedir} pom.xml @@ -154,7 +154,9 @@ DO NOT MODIFIY - GENERATED CODE 3.2.0 - MANIFEST.MF + + joonsrenderer +