You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2018/11/18 22:22:37 UTC
[1/8] buildr git commit: Update Travis CI matrix
Repository: buildr
Updated Branches:
refs/heads/master 5564d3e15 -> 4e84867fd
Update Travis CI matrix
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/d9b4e32b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/d9b4e32b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/d9b4e32b
Branch: refs/heads/master
Commit: d9b4e32b061c0258701994bb75b19963a0c6d4d1
Parents: 69541b0
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sat Nov 17 22:12:41 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sat Nov 17 22:12:41 2018 +0100
----------------------------------------------------------------------
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/d9b4e32b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5543afa..c6e7be4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ jdk:
- oraclejdk8
- oraclejdk7
rvm:
- - 2.3.1
- - jruby-1.7.25
- - jruby-9.0.5.0
+ - 2.5.3
+ - jruby-1.7.27
+ - jruby-9.2.4.0
git:
depth: 10
scala:
[3/8] buildr git commit: Travis: Drop unsupported MaxPermSize Java
configuration param
Posted by do...@apache.org.
Travis: Drop unsupported MaxPermSize Java configuration param
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/9b702bc8
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/9b702bc8
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/9b702bc8
Branch: refs/heads/master
Commit: 9b702bc894f7344723ec3e956dc5b3045d6f8794
Parents: 092881d
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sat Nov 17 22:39:38 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sat Nov 17 22:39:38 2018 +0100
----------------------------------------------------------------------
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/9b702bc8/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7393ede..3e7933c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ scala:
- 2.11.8
install:
- source ci-setup.sh
- - export JRUBY_OPTS="-J-XX:MaxPermSize=312m -J-Xmx700M"
- - export JAVA_OPTS="-Xmx700m -XX:MaxPermSize=312m"
+ - export JRUBY_OPTS="--J-Xmx700M"
+ - export JAVA_OPTS="-Xmx700m"
script: rake ci
notifications:
email:
[2/8] buildr git commit: Travis: drop OracleJDK7
Posted by do...@apache.org.
Travis: drop OracleJDK7
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/092881d5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/092881d5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/092881d5
Branch: refs/heads/master
Commit: 092881d515af1c5fb79345a552d56ee0b4b9526d
Parents: d9b4e32
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sat Nov 17 22:24:03 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sat Nov 17 22:24:03 2018 +0100
----------------------------------------------------------------------
.travis.yml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/092881d5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c6e7be4..7393ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: ruby
jdk:
- oraclejdk8
- - oraclejdk7
rvm:
- 2.5.3
- jruby-1.7.27
[7/8] buildr git commit: Travis: back out of change
Posted by do...@apache.org.
Travis: back out of change
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/d14630c5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/d14630c5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/d14630c5
Branch: refs/heads/master
Commit: d14630c5dd9a1991ec64f62e2787101a6b44c272
Parents: 96893f4
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sun Nov 18 09:12:09 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sun Nov 18 09:12:09 2018 +0100
----------------------------------------------------------------------
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/d14630c5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 96e7391..a107998 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: ruby
jdk:
- oraclejdk8
rvm:
- - 2.5.3
+ - 2.3.1
- jruby-1.7.27
- - jruby-9.2.4.0
+ - jruby-9.0.5.0
git:
depth: 10
scala:
[4/8] buildr git commit: Travis: typo in JRUBY_OPTS
Posted by do...@apache.org.
Travis: typo in JRUBY_OPTS
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a40e6369
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a40e6369
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a40e6369
Branch: refs/heads/master
Commit: a40e6369318a748e6d1d6b468ded6c5c3d38f989
Parents: 9b702bc
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sat Nov 17 22:48:28 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sat Nov 17 22:48:28 2018 +0100
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a40e6369/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 3e7933c..96e7391 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ scala:
- 2.11.8
install:
- source ci-setup.sh
- - export JRUBY_OPTS="--J-Xmx700M"
+ - export JRUBY_OPTS="-J-Xmx700M"
- export JAVA_OPTS="-Xmx700m"
script: rake ci
notifications:
[8/8] buildr git commit: Merge remote-tracking branch 'github/pr/34'
Posted by do...@apache.org.
Merge remote-tracking branch 'github/pr/34'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4e84867f
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4e84867f
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4e84867f
Branch: refs/heads/master
Commit: 4e84867fd1e5af7314bce7ba42988758d99f7e2e
Parents: 5564d3e d14630c
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Nov 19 09:22:07 2018 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Nov 19 09:22:07 2018 +1100
----------------------------------------------------------------------
.travis.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[5/8] buildr git commit: RSpec.shared_examples syntax
Posted by do...@apache.org.
RSpec.shared_examples syntax
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/70aa2734
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/70aa2734
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/70aa2734
Branch: refs/heads/master
Commit: 70aa2734b86279c657fd43b0fa54794ce0b7a336
Parents: a40e636
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sat Nov 17 23:01:07 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sat Nov 17 23:01:07 2018 +0100
----------------------------------------------------------------------
spec/core/build_spec.rb | 4 ++--
spec/core/checks_spec.rb | 2 +-
spec/core/compile_spec.rb | 2 +-
spec/core/shell_spec.rb | 2 +-
spec/ide/eclipse_spec.rb | 2 +-
spec/java/packaging_spec.rb | 6 +++---
spec/java/test_coverage_helper.rb | 2 +-
spec/kotlin/compiler_spec.rb | 6 +++---
spec/packaging/archive_spec.rb | 2 +-
spec/packaging/packaging_helper.rb | 2 +-
spec/scala/compiler_spec.rb | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/core/build_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/build_spec.rb b/spec/core/build_spec.rb
index b1953c7..8df189a 100644
--- a/spec/core/build_spec.rb
+++ b/spec/core/build_spec.rb
@@ -16,7 +16,7 @@
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
-shared_examples_for 'local task' do
+RSpec.shared_examples 'local task' do
it "should execute task for project in current directory" do
define 'foobar'
lambda { @task.invoke }.should run_task("foobar:#{@task.name}")
@@ -387,7 +387,7 @@ describe Release do
end
-shared_examples_for 'a release process' do
+RSpec.shared_examples 'a release process' do
describe '#make' do
before do
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/core/checks_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/checks_spec.rb b/spec/core/checks_spec.rb
index 4232bff..edb152c 100644
--- a/spec/core/checks_spec.rb
+++ b/spec/core/checks_spec.rb
@@ -343,7 +343,7 @@ end
describe Buildr::Checks::Expectation do
- shared_examples_for 'all archive types' do
+ RSpec.shared_examples 'all archive types' do
before do
archive = @archive
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/core/compile_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/compile_spec.rb b/spec/core/compile_spec.rb
index 69e5037..f3f23d1 100644
--- a/spec/core/compile_spec.rb
+++ b/spec/core/compile_spec.rb
@@ -428,7 +428,7 @@ describe Buildr::CompileTask, '#invoke' do
end
-shared_examples_for 'accessor task' do
+RSpec.shared_examples 'accessor task' do
it 'should return a task' do
define('foo').send(@task_name).should be_kind_of(Rake::Task)
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/core/shell_spec.rb
----------------------------------------------------------------------
diff --git a/spec/core/shell_spec.rb b/spec/core/shell_spec.rb
index b8766e1..c571307 100644
--- a/spec/core/shell_spec.rb
+++ b/spec/core/shell_spec.rb
@@ -102,7 +102,7 @@ describe Project, '.shell' do
end
end
-shared_examples_for "shell provider" do
+RSpec.shared_examples "shell provider" do
it 'should have launch method accepting shell task' do
@instance.method(:launch).should_not be_nil
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/ide/eclipse_spec.rb
----------------------------------------------------------------------
diff --git a/spec/ide/eclipse_spec.rb b/spec/ide/eclipse_spec.rb
index 7ecb2bc..f50af1a 100644
--- a/spec/ide/eclipse_spec.rb
+++ b/spec/ide/eclipse_spec.rb
@@ -382,7 +382,7 @@ MANIFEST
write 'src/test/java/Test.java'
end
- shared_examples_for 'source' do
+ RSpec.shared_examples 'source' do
it 'should ignore CVS and SVN files' do
define('foo')
classpath_sources('excluding').each do |excluding_attribute|
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index a13f4a4..499fb10 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -53,7 +53,7 @@ describe Project, '#manifest' do
end
-shared_examples_for 'package with manifest' do
+RSpec.shared_examples 'package with manifest' do
before do
@long_line = 'No line may be longer than 72 bytes (not characters), in its UTF8-encoded form. If a value would make the initial line longer than this, it should be continued on extra lines (each starting with a single SPACE).'
end
@@ -347,7 +347,7 @@ describe Project, '#meta_inf' do
end
-shared_examples_for 'package with meta_inf' do
+RSpec.shared_examples 'package with meta_inf' do
def package_with_meta_inf(meta_inf = nil)
packaging = @packaging
@@ -1258,7 +1258,7 @@ describe Packaging, 'test_jar' do
end
end
-shared_examples_for 'package_with_' do
+RSpec.shared_examples 'package_with_' do
def prepare(options = {})
packager = "package_with_#{@packaging}"
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/java/test_coverage_helper.rb
----------------------------------------------------------------------
diff --git a/spec/java/test_coverage_helper.rb b/spec/java/test_coverage_helper.rb
index 1651c97..ae72c0c 100644
--- a/spec/java/test_coverage_helper.rb
+++ b/spec/java/test_coverage_helper.rb
@@ -53,7 +53,7 @@ module TestCoverageHelper
end
end
-shared_examples_for 'test coverage tool' do
+RSpec.shared_examples 'test coverage tool' do
include TestCoverageHelper
def toolname
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/kotlin/compiler_spec.rb
----------------------------------------------------------------------
diff --git a/spec/kotlin/compiler_spec.rb b/spec/kotlin/compiler_spec.rb
index 200f60a..aa2f1c1 100644
--- a/spec/kotlin/compiler_spec.rb
+++ b/spec/kotlin/compiler_spec.rb
@@ -17,7 +17,7 @@
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
# need to test both with and without KOTLIN_HOME
-share_as :KotlincCompiler do
+RSpec.shared_examples 'KotlincCompiler' do
it 'should identify itself from source directories' do
write 'src/main/kotlin/com/example/Test.kt', "package com.example\n class Test { }"
@@ -110,7 +110,7 @@ share_as :KotlincCompiler do
end
end
-share_as :KotlincCompiler_CommonOptions do
+RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
it 'should set warnings option to false by default' do
compile_task.options.warnings.should be_false
@@ -271,4 +271,4 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
ENV['KOTLIN_HOME'] = old_home
end
end
-end
\ No newline at end of file
+end
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/packaging/archive_spec.rb
----------------------------------------------------------------------
diff --git a/spec/packaging/archive_spec.rb b/spec/packaging/archive_spec.rb
index 46f1151..827c4e8 100644
--- a/spec/packaging/archive_spec.rb
+++ b/spec/packaging/archive_spec.rb
@@ -60,7 +60,7 @@ module ArchiveTaskHelpers
end
end
-shared_examples_for 'ArchiveTask' do
+RSpec.shared_examples 'ArchiveTask' do
include ArchiveTaskHelpers
before(:each) do
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/packaging/packaging_helper.rb
----------------------------------------------------------------------
diff --git a/spec/packaging/packaging_helper.rb b/spec/packaging/packaging_helper.rb
index d555d03..76f2247 100644
--- a/spec/packaging/packaging_helper.rb
+++ b/spec/packaging/packaging_helper.rb
@@ -14,7 +14,7 @@
# the License.
-shared_examples_for 'packaging' do
+RSpec.shared_examples 'packaging' do
it 'should create artifact of proper type' do
packaging = @packaging
package_type = @package_type || @packaging
http://git-wip-us.apache.org/repos/asf/buildr/blob/70aa2734/spec/scala/compiler_spec.rb
----------------------------------------------------------------------
diff --git a/spec/scala/compiler_spec.rb b/spec/scala/compiler_spec.rb
index 509d567..a76608d 100644
--- a/spec/scala/compiler_spec.rb
+++ b/spec/scala/compiler_spec.rb
@@ -17,7 +17,7 @@
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
# need to test both with and without SCALA_HOME
-share_as :ScalacCompiler do
+RSpec.shared_examples 'ScalacCompiler' do
it 'should identify itself from source directories' do
write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
@@ -140,7 +140,7 @@ describe 'scala compiler (downloaded from repository)' do
end
end
-share_as :ScalacCompiler_CommonOptions do
+RSpec.shared_examples 'ScalacCompiler_CommonOptions' do
it 'should set warnings option to false by default' do
compile_task.options.warnings.should be_false
[6/8] buildr git commit: RSpec it_should_behave_like takes a String
Posted by do...@apache.org.
RSpec it_should_behave_like takes a String
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/96893f4a
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/96893f4a
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/96893f4a
Branch: refs/heads/master
Commit: 96893f4a4037cb3015c4c4a7c6f9996fa379600f
Parents: 70aa273
Author: Olle Jonsson <ol...@gmail.com>
Authored: Sat Nov 17 23:07:19 2018 +0100
Committer: Olle Jonsson <ol...@gmail.com>
Committed: Sat Nov 17 23:07:19 2018 +0100
----------------------------------------------------------------------
spec/kotlin/compiler_spec.rb | 8 ++++----
spec/scala/compiler_spec.rb | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/96893f4a/spec/kotlin/compiler_spec.rb
----------------------------------------------------------------------
diff --git a/spec/kotlin/compiler_spec.rb b/spec/kotlin/compiler_spec.rb
index aa2f1c1..5d27884 100644
--- a/spec/kotlin/compiler_spec.rb
+++ b/spec/kotlin/compiler_spec.rb
@@ -240,8 +240,8 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
@compile_task ||= define('foo').compile.using(:kotlinc)
end
- it_should_behave_like KotlincCompiler
- it_should_behave_like KotlincCompiler_CommonOptions
+ it_should_behave_like 'KotlincCompiler'
+ it_should_behave_like 'KotlincCompiler_CommonOptions'
end
end
@@ -264,8 +264,8 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
compile_task.instance_eval { @compiler }.send(:kotlinc_args)
end
- it_should_behave_like KotlincCompiler
- it_should_behave_like KotlincCompiler_CommonOptions
+ it_should_behave_like 'KotlincCompiler'
+ it_should_behave_like 'KotlincCompiler_CommonOptions'
after :all do
ENV['KOTLIN_HOME'] = old_home
http://git-wip-us.apache.org/repos/asf/buildr/blob/96893f4a/spec/scala/compiler_spec.rb
----------------------------------------------------------------------
diff --git a/spec/scala/compiler_spec.rb b/spec/scala/compiler_spec.rb
index a76608d..3903581 100644
--- a/spec/scala/compiler_spec.rb
+++ b/spec/scala/compiler_spec.rb
@@ -118,7 +118,7 @@ if ENV['SCALA_HOME']
ENV['SCALA_HOME'].should_not be_nil
end
- it_should_behave_like ScalacCompiler
+ it_should_behave_like 'ScalacCompiler'
end
end
@@ -133,7 +133,7 @@ describe 'scala compiler (downloaded from repository)' do
ENV['SCALA_HOME'].should be_nil
end
- it_should_behave_like ScalacCompiler
+ it_should_behave_like 'ScalacCompiler'
after :all do
ENV['SCALA_HOME'] = old_home
@@ -275,7 +275,7 @@ end
describe 'scala compiler 2.8 options' do
- it_should_behave_like ScalacCompiler_CommonOptions
+ it_should_behave_like 'ScalacCompiler_CommonOptions'
def compile_task
@compile_task ||= define('foo').compile.using(:scalac)
@@ -298,7 +298,7 @@ end if Buildr::Scala.version?(2.8)
describe 'scala compiler 2.9 options' do
- it_should_behave_like ScalacCompiler_CommonOptions
+ it_should_behave_like 'ScalacCompiler_CommonOptions'
def compile_task
@compile_task ||= define('foo').compile.using(:scalac)
@@ -345,7 +345,7 @@ describe 'zinc compiler (enabled through Buildr.settings)' do
compile_task.invoke
end
- it_should_behave_like ScalacCompiler
+ it_should_behave_like 'ScalacCompiler'
after :each do
Buildr.settings.build['scalac.incremental'] = nil