Skip to content

Commit 9a1f8c1

Browse files
committed
revert processing version for travis
1 parent aa59e89 commit 9a1f8c1

File tree

4 files changed

+24
-30
lines changed

4 files changed

+24
-30
lines changed

Rakefile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
require_relative 'lib/ruby_wordcram/version'
22

3-
def create_manifest
4-
title = 'Implementation-Title: WordCram for JRubyArt and propane)'
5-
version = format('Implementation-Version: %s', WordCram::VERSION)
6-
File.open('MANIFEST.MF', 'w') do |f|
7-
f.puts(title)
8-
f.puts(version)
9-
f.puts('Class-Path: jsoup-1.12.1.jar')
10-
end
11-
end
12-
13-
task default: [:init, :compile, :install]
14-
15-
desc 'Create Manifest'
16-
task :init do
17-
create_manifest
18-
end
3+
task default: [:compile, :install, :gem]
194

205
desc 'Install'
216
task :install do

pom.rb

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project 'Wordcram' do
22

33
model_version '4.0.0'
4-
id 'wordcram:WordCram:2.0.5'
4+
id 'wordcram:WordCram:2.0.6'
55
packaging 'jar'
66

77
description 'WordCram for JRubyArt and propane'
@@ -21,17 +21,20 @@
2121
roles 'developer'
2222
end
2323

24-
properties( 'maven.compiler.target' => '1.8',
25-
'source.directory' => 'src',
26-
'maven.compiler.source' => '1.8',
27-
'polyglot.dump.pom' => 'pom.xml',
28-
'project.build.sourceEncoding' => 'utf-8',
29-
'wordcram.basedir' => '${project.basedir}' )
24+
properties( 'source.directory' => 'src',
25+
'polyglot.dump.pom' => 'pom.xml',
26+
'project.build.sourceEncoding' => 'UTF-8',
27+
'target.release' => '11',
28+
'polyglot.dump.pom' => 'pom.xml',
29+
'wordcram.basedir' => '${project.basedir}'
30+
)
3031

31-
jar 'org.processing:core:4.0.0'
32+
jar 'org.processing:core:3.3.7'
3233
jar 'org.jsoup:jsoup:1.13.1'
3334

3435
overrides do
36+
plugin( :compiler, '3.8.1',
37+
'release' => '${target.release}' )
3538
plugin( :jar, '3.2.0',
3639
'archive' => {
3740
'manifestEntries' => {

pom.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>wordcram</groupId>
1313
<artifactId>WordCram</artifactId>
14-
<version>2.0.5</version>
14+
<version>2.0.6</version>
1515
<name>Wordcram</name>
1616
<description>WordCram for JRubyArt and propane</description>
1717
<developers>
@@ -38,11 +38,10 @@ DO NOT MODIFIY - GENERATED CODE
3838
</developer>
3939
</developers>
4040
<properties>
41-
<maven.compiler.source>1.8</maven.compiler.source>
42-
<maven.compiler.target>1.8</maven.compiler.target>
4341
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
44-
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
42+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4543
<source.directory>src</source.directory>
44+
<target.release>11</target.release>
4645
<wordcram.basedir>${project.basedir}</wordcram.basedir>
4746
</properties>
4847
<dependencies>
@@ -71,6 +70,13 @@ DO NOT MODIFIY - GENERATED CODE
7170
<finalName>WordCram</finalName>
7271
<pluginManagement>
7372
<plugins>
73+
<plugin>
74+
<artifactId>maven-compiler-plugin</artifactId>
75+
<version>3.8.1</version>
76+
<configuration>
77+
<release>${target.release}</release>
78+
</configuration>
79+
</plugin>
7480
<plugin>
7581
<artifactId>maven-jar-plugin</artifactId>
7682
<version>3.2.0</version>

ruby_wordcram.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Gem::Specification.new do |spec|
99
spec.extra_rdoc_files = %w{README.md LICENSE}
1010
spec.summary = %q{Updated and extended WordCram library for JRubyArt and propane}
1111
spec.description =<<-EOS
12-
WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.6.3 and processing-3.5.3
12+
WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-2.5.0
1313
EOS
1414
spec.licenses = %w{Apache-2.0}
1515
spec.authors = %w{Dan\ Bernier Jonathan\ Feinberg Martin\ Prout}
1616
spec.email = '[email protected]'
1717
spec.homepage = 'http://ruby-processing.github.io/WordCram/'
1818
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
1919
spec.files << 'lib/WordCram.jar'
20-
spec.files << 'lib/jsoup-1.12.1.jar'
20+
spec.files << 'lib/jsoup-1.13.1.jar'
2121
spec.require_paths = ['lib']
2222
spec.add_development_dependency 'rake', '~> 12', '>= 12.0'
2323
end

0 commit comments

Comments
 (0)