Skip to content

Commit aa59e89

Browse files
committed
update
1 parent 0f0a4f2 commit aa59e89

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: ruby
22
sudo: false
33

44
rvm:
5-
- jruby-9.1.12.0
5+
- jruby-9.2.11.1
66
jdk:
77
- oraclejdk11
88
os:

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
**v2.0.5**
2-
Bump jsoup version for PiCrate-1.2.2+, JRubyArt-1.2.2+, propane-3.4.0+
2+
Bump jsoup-1.13.1 version for PiCrate-1.2.2+, JRubyArt-1.2.2+, propane-3.4.0+
3+
4+
**v2.0.5**
5+
Bump jsoup-1.12.1 version for PiCrate-1.2.2+, JRubyArt-1.2.2+, propane-3.4.0+
36

47
**v2.0.4**
58
JRubyArt-1.6.3 and processing-3.5.3

lib/ruby_wordcram.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if RUBY_PLATFORM == 'java'
44
require 'WordCram.jar'
5-
require 'jsoup-1.12.1.jar'
5+
require 'jsoup-1.13.1.jar'
66
wc = %w[WordAngler WordColorer WordCram WordFonter WordPlacer WordSkipReason]
77
sh = %w[Colorers ImageShaper Observer Placers Word ShapeBasedPlacer]
88
WC = wc.concat(sh).freeze

lib/ruby_wordcram/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module WordCram
4-
VERSION = '2.0.5'.freeze
4+
VERSION = '2.0.6'.freeze
55
end

pom.rb

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,22 @@
2828
'project.build.sourceEncoding' => 'utf-8',
2929
'wordcram.basedir' => '${project.basedir}' )
3030

31-
jar 'org.processing:core:3.3.5'
32-
jar 'org.jsoup:jsoup:1.12.1'
31+
jar 'org.processing:core:4.0.0'
32+
jar 'org.jsoup:jsoup:1.13.1'
3333

3434
overrides do
35-
plugin( :jar,
35+
plugin( :jar, '3.2.0',
3636
'archive' => {
3737
'manifestEntries' => {
38-
'Built-By' => 'monkstone',
39-
'Implementation-Title' => 'ruby_wordcram',
40-
'Implementation-Version' => '2.0.5',
41-
'Automatic-Module-Name' => 'ruby-processing.wordcram'
38+
'Automatic-Module-Name' => 'org.processing.core'
4239
}
4340
} )
4441
plugin :resources, '2.6'
4542
plugin :dependency, '2.10' do
4643
execute_goals( :id => 'default-cli',
4744
'artifactItems' => [ { 'groupId' => 'org.jsoup',
4845
'artifactId' => 'jsoup',
49-
'version' => '1.12.1',
46+
'version' => '1.13.1',
5047
'type' => 'jar',
5148
'outputDirectory' => '${wordcram.basedir}/lib' } ] )
5249
end
@@ -60,7 +57,6 @@
6057

6158
resource do
6259
directory 'src'
63-
includes
6460
excludes '**/*.java'
6561
end
6662
end

pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ DO NOT MODIFIY - GENERATED CODE
4949
<dependency>
5050
<groupId>org.processing</groupId>
5151
<artifactId>core</artifactId>
52-
<version>3.3.5</version>
52+
<version>4.0.0</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.jsoup</groupId>
5656
<artifactId>jsoup</artifactId>
57-
<version>1.12.1</version>
57+
<version>1.13.1</version>
5858
</dependency>
5959
</dependencies>
6060
<build>
@@ -73,13 +73,11 @@ DO NOT MODIFIY - GENERATED CODE
7373
<plugins>
7474
<plugin>
7575
<artifactId>maven-jar-plugin</artifactId>
76+
<version>3.2.0</version>
7677
<configuration>
7778
<archive>
7879
<manifestEntries>
79-
<Built-By>monkstone</Built-By>
80-
<Implementation-Title>ruby_wordcram</Implementation-Title>
81-
<Implementation-Version>2.0.5</Implementation-Version>
82-
<Automatic-Module-Name>ruby-processing.wordcram</Automatic-Module-Name>
80+
<Automatic-Module-Name>org.processing.core</Automatic-Module-Name>
8381
</manifestEntries>
8482
</archive>
8583
</configuration>
@@ -99,7 +97,7 @@ DO NOT MODIFIY - GENERATED CODE
9997
<artifactItem>
10098
<groupId>org.jsoup</groupId>
10199
<artifactId>jsoup</artifactId>
102-
<version>1.12.1</version>
100+
<version>1.13.1</version>
103101
<type>jar</type>
104102
<outputDirectory>${wordcram.basedir}/lib</outputDirectory>
105103
</artifactItem>

0 commit comments

Comments
 (0)