Repository: buildr Updated Branches: refs/heads/master 5b26f78d4 -> da9a10a41
Remove additional deprecated features and tests for 1.5 Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/da9a10a4 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/da9a10a4 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/da9a10a4 Branch: refs/heads/master Commit: da9a10a41db5f3dbf3013d9eb55e090773fd99fc Parents: 5b26f78 Author: Antoine Toulme <[email protected]> Authored: Sat Aug 20 22:38:45 2016 -0700 Committer: Antoine Toulme <[email protected]> Committed: Sat Aug 20 22:38:45 2016 -0700 ---------------------------------------------------------------------- CHANGELOG | 5 ++++ lib/buildr/core/application.rb | 3 +-- lib/buildr/core/build.rb | 24 ----------------- lib/buildr/groovy/bdd.rb | 7 ----- lib/buildr/java/bdd.rb | 7 ----- lib/buildr/java/tests.rb | 7 ----- lib/buildr/scala/tests.rb | 14 ---------- spec/addon/jaxb_xjc_spec.rb | 4 --- spec/core/build_spec.rb | 51 ------------------------------------- spec/scala/tests_spec.rb | 5 ---- 10 files changed, 6 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index f607835..d887b45 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,11 @@ * Change: Remove Buildr::TestTask responding to :using with .using('foo','bar'), deprecated in version 1.3 * Change: Remove addon/buildr/cobertura.rb, deprecated since 1.3.4 * Change: Remove addon/buildr/emma.rb, deprecated since 1.3.4 +* Change: Remove support for Rakefile/rakefile, deprecated. +* Change: Remove project#target, project#reports, deprecated. +* Change: Remove JBehave::REQUIRES, deprecated. +* Change: Remove JMock::REQUIRES, deprecated. +* Change: Remove ScalaCheck::REQUIRES, deprecated. * Added: Travis badge to README.rdoc * Added: Added Rubygems badges to README.rdoc * Added: BUILDR-577 Allow remote repo to be added with http basic auth support. Submitted by Michael Guymon. http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/lib/buildr/core/application.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/core/application.rb b/lib/buildr/core/application.rb index 5554084..231e099 100644 --- a/lib/buildr/core/application.rb +++ b/lib/buildr/core/application.rb @@ -106,8 +106,7 @@ module Buildr class Application < Rake::Application #:nodoc: - # Deprecated: rakefile/Rakefile, removed in 1.5 - DEFAULT_BUILDFILES = ['buildfile', 'Buildfile', 'buildfile.rb', 'Buildfile.rb'] + DEFAULT_RAKEFILES + DEFAULT_BUILDFILES = ['buildfile', 'Buildfile', 'buildfile.rb', 'Buildfile.rb'] attr_reader :rakefiles, :requires private :rakefiles, :requires http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/lib/buildr/core/build.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/core/build.rb b/lib/buildr/core/build.rb index 6e2a4ee..365710f 100644 --- a/lib/buildr/core/build.rb +++ b/lib/buildr/core/build.rb @@ -56,30 +56,6 @@ module Buildr #:nodoc: after_define(:build) - # *Deprecated:* Use +path_to(:target)+ instead. - def target - Buildr.application.deprecated 'Use path_to(:target) instead' - layout.expand(:target) - end - - # *Deprecated:* Use Layout instead. - def target=(dir) - Buildr.application.deprecated 'Use Layout instead' - layout[:target] = _(dir) - end - - # *Deprecated:* Use +path_to(:reports)+ instead. - def reports() - Buildr.application.deprecated 'Use path_to(:reports) instead' - layout.expand(:reports) - end - - # *Deprecated:* Use Layout instead. - def reports=(dir) - Buildr.application.deprecated 'Use Layout instead' - layout[:reports] = _(dir) - end - # :call-seq: # build(*prereqs) => task # build { |task| .. } => task http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/lib/buildr/groovy/bdd.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/groovy/bdd.rb b/lib/buildr/groovy/bdd.rb index 8e49e8c..546926d 100644 --- a/lib/buildr/groovy/bdd.rb +++ b/lib/buildr/groovy/bdd.rb @@ -53,13 +53,6 @@ module Buildr::Groovy **/*Specification.groovy **/*Story.groovy }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? } end - - private - def const_missing(const) - return super unless const == :REQUIRES # TODO: remove in 1.5 - Buildr.application.deprecated "Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION" - dependencies - end end def tests(dependencies) #:nodoc: http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/lib/buildr/java/bdd.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/bdd.rb b/lib/buildr/java/bdd.rb index 3a70b13..475edbc 100644 --- a/lib/buildr/java/bdd.rb +++ b/lib/buildr/java/bdd.rb @@ -309,13 +309,6 @@ module Buildr #:nodoc: **/*Behaviour.java **/*Behavior.java }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? } end - - private - def const_missing(const) - return super unless const == :REQUIRES # TODO: remove in 1.5 - Buildr.application.deprecated 'Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION' - dependencies - end end def tests(dependencies) #:nodoc: http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/lib/buildr/java/tests.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/tests.rb b/lib/buildr/java/tests.rb index 92ecc0a..d868335 100644 --- a/lib/buildr/java/tests.rb +++ b/lib/buildr/java/tests.rb @@ -108,13 +108,6 @@ module Buildr #:nodoc: end @dependencies end - - private - def const_missing(const) - return super unless const == :REQUIRES # TODO: remove in 1.5 - Buildr.application.deprecated 'Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION' - dependencies - end end end http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/lib/buildr/scala/tests.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/scala/tests.rb b/lib/buildr/scala/tests.rb index f638cf4..918a233 100644 --- a/lib/buildr/scala/tests.rb +++ b/lib/buildr/scala/tests.rb @@ -79,13 +79,6 @@ module Buildr::Scala#:nodoc: ["#{group}:#{artifact}:jar:#{version}"] end end - - private - def const_missing(const) - return super unless const == :REQUIRES # TODO: remove in 1.5 - Buildr.application.deprecated "Please use Scala::Check.dependencies/.version instead of ScalaCheck::REQUIRES/VERSION" - dependencies - end end end @@ -216,11 +209,4 @@ module Buildr::Scala#:nodoc: end - -# Backwards compatibility stuff. Remove in 1.5. -module Buildr#:nodoc: - ScalaCheck = Scala::Check - ScalaTest = Scala::ScalaTest -end - Buildr::TestFramework << Buildr::Scala::ScalaTest http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/spec/addon/jaxb_xjc_spec.rb ---------------------------------------------------------------------- diff --git a/spec/addon/jaxb_xjc_spec.rb b/spec/addon/jaxb_xjc_spec.rb index d35c753..851b7b4 100644 --- a/spec/addon/jaxb_xjc_spec.rb +++ b/spec/addon/jaxb_xjc_spec.rb @@ -15,7 +15,6 @@ require File.expand_path('../spec_helpers', File.dirname(__FILE__)) -if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6" Sandbox.require_optional_extension 'buildr/jaxb_xjc' XSD_CONTENT = <<XSD @@ -125,6 +124,3 @@ describe Buildr::JaxbXjc do end end -elsif Buildr::VERSION >= '1.5' - raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported." -end http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/spec/core/build_spec.rb ---------------------------------------------------------------------- diff --git a/spec/core/build_spec.rb b/spec/core/build_spec.rb index 2e3162a..b1953c7 100644 --- a/spec/core/build_spec.rb +++ b/spec/core/build_spec.rb @@ -149,57 +149,6 @@ describe Project, '#clean' do end end - -describe Project, '#target' do - before :each do - @project = define('foo', :layout=>Layout.new) - end - - it 'should default to target' do - @project.target.should eql('target') - end - - it 'should set layout :target' do - @project.target = 'bar' - @project.layout.expand(:target).should point_to_path('bar') - end - - it 'should come from layout :target' do - @project.layout[:target] = 'baz' - @project.target.should eql('baz') - end - - it 'should be removed in version 1.5 since it was deprecated in version 1.3' do - Buildr::VERSION.should < '1.5' - end -end - - -describe Project, '#reports' do - before :each do - @project = define('foo', :layout=>Layout.new) - end - - it 'should default to reports' do - @project.reports.should eql('reports') - end - - it 'should set layout :reports' do - @project.reports = 'bar' - @project.layout.expand(:reports).should point_to_path('bar') - end - - it 'should come from layout :reports' do - @project.layout[:reports] = 'baz' - @project.reports.should eql('baz') - end - - it 'should be removed in version 1.5 since it was deprecated in version 1.3' do - Buildr::VERSION.should < '1.5' - end -end - - describe Hg do describe '#current_branch' do it 'should return the correct branch' do http://git-wip-us.apache.org/repos/asf/buildr/blob/da9a10a4/spec/scala/tests_spec.rb ---------------------------------------------------------------------- diff --git a/spec/scala/tests_spec.rb b/spec/scala/tests_spec.rb index 49e7496..175dcab 100644 --- a/spec/scala/tests_spec.rb +++ b/spec/scala/tests_spec.rb @@ -15,8 +15,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers')) -if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6" - # TODO's # -test passing System props # -test passing ENV variables @@ -286,6 +284,3 @@ describe Buildr::Scala::ScalaTest do end -elsif Buildr::VERSION >= '1.5' - raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported." -end
