buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toulm...@apache.org
Subject buildr git commit: * Change: Remove orderedhash gem. * Change: Update jruby-openssl to 0.9.17 * Change: Move hoe to the development dependencies * Change: Update json_pure to 2.0.2
Date Sun, 09 Oct 2016 07:00:05 GMT
Repository: buildr
Updated Branches:
  refs/heads/master 212a62096 -> 1dc1a357f


* Change: Remove orderedhash gem.
* Change: Update jruby-openssl to 0.9.17
* Change: Move hoe to the development dependencies
* Change: Update json_pure to 2.0.2


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/1dc1a357
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/1dc1a357
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/1dc1a357

Branch: refs/heads/master
Commit: 1dc1a357f105003881515cb1c3d233d7ce7527c5
Parents: 212a620
Author: Antoine Toulme <antoine@lunar-ocean.com>
Authored: Sat Oct 8 23:59:36 2016 -0700
Committer: Antoine Toulme <antoine@lunar-ocean.com>
Committed: Sat Oct 8 23:59:36 2016 -0700

----------------------------------------------------------------------
 CHANGELOG                       | 4 ++++
 buildr.gemspec                  | 7 +++----
 lib/buildr.rb                   | 1 -
 lib/buildr/packaging/archive.rb | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/1dc1a357/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 09f1c74..6f0fd79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 1.5.1 (Pending)
+* Change: Remove orderedhash gem.
+* Change: Update jruby-openssl to 0.9.17
+* Change: Move hoe to the development dependencies
+* Change: Update json_pure to 2.0.2
 
 1.5.0 (2016-09-23)
 * Change: Update RJB to 1.5.4

http://git-wip-us.apache.org/repos/asf/buildr/blob/1dc1a357/buildr.gemspec
----------------------------------------------------------------------
diff --git a/buildr.gemspec b/buildr.gemspec
index 9741dcd..bf93076 100644
--- a/buildr.gemspec
+++ b/buildr.gemspec
@@ -64,16 +64,14 @@ for those one-off tasks, with a language that's a joy to use.
   # Required for sftp support under windows
   spec.add_dependency 'jruby-pageant',        '1.1.1' if $platform.to_s == 'java'
   spec.add_dependency 'rubyzip',              '1.2.0'
-  spec.add_dependency 'json_pure',            '1.8.3'
-  spec.add_dependency 'hoe',                  '3.15.0'
+  spec.add_dependency 'json_pure',            '2.0.2'
   spec.add_dependency 'rjb',                  '1.5.4' if ($platform.to_s == 'x86-mswin32'
|| $platform.to_s == 'ruby')
   spec.add_dependency 'atoulme-Antwrap',      '0.7.5'
   spec.add_dependency 'diff-lcs',             '1.2.5'
   spec.add_dependency 'xml-simple',           '1.1.5'
   spec.add_dependency 'minitar',              '0.5.4'
-  spec.add_dependency 'jruby-openssl',        '~> 0.9.16' if $platform.to_s == 'java'
+  spec.add_dependency 'jruby-openssl',        '~> 0.9.17' if $platform.to_s == 'java'
   spec.add_dependency 'bundler'
-  spec.add_dependency 'orderedhash',          '0.0.6'
   spec.add_dependency 'win32console'          '1.3.2' if $platform.to_s == 'x86-mswin32'
 
   # Unable to get this consistently working under jruby on windows
@@ -86,6 +84,7 @@ for those one-off tasks, with a language that's a joy to use.
     spec.add_development_dependency 'jekyll-textile-converter', '0.1.0'
   end
 
+  spec.add_development_dependency 'hoe',                  '3.15.1'
   spec.add_development_dependency 'rspec-expectations',   '2.14.3'
   spec.add_development_dependency 'rspec-mocks',          '2.14.3'
   spec.add_development_dependency 'rspec-core',           '2.14.5'

http://git-wip-us.apache.org/repos/asf/buildr/blob/1dc1a357/lib/buildr.rb
----------------------------------------------------------------------
diff --git a/lib/buildr.rb b/lib/buildr.rb
index 3f7cbee..2bd5875 100644
--- a/lib/buildr.rb
+++ b/lib/buildr.rb
@@ -33,7 +33,6 @@ require 'find'
 require 'uri'
 require 'stringio'
 require 'fileutils'
-require 'orderedhash'
 require 'securerandom'
 
 require 'buildr/rspec_check'

http://git-wip-us.apache.org/repos/asf/buildr/blob/1dc1a357/lib/buildr/packaging/archive.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/packaging/archive.rb b/lib/buildr/packaging/archive.rb
index da0603d..d710b8c 100644
--- a/lib/buildr/packaging/archive.rb
+++ b/lib/buildr/packaging/archive.rb
@@ -327,7 +327,7 @@ module Buildr #:nodoc:
 
       # Make sure we're the last enhancements, so other enhancements can add content.
       enhance do
-        @file_map = OrderedHash.new
+        @file_map = {}
         enhance do
           send 'create' if respond_to?(:create)
           # We're here because the archive file does not exist, or one of the files is newer
than the archive contents;
@@ -360,7 +360,7 @@ module Buildr #:nodoc:
     #
     #    package(:jar).clean.include path_to('desired/content')
     def clean
-      @paths = OrderedHash.new
+      @paths = {}
       @paths[''] = Path.new(self, '')
       @prepares = []
       self
@@ -485,7 +485,7 @@ module Buildr #:nodoc:
       @prepares.each { |prepare| prepare.call(self) }
       @prepares.clear
 
-      file_map = OrderedHash.new
+      file_map = {}
       @paths.each do |name, path|
         path.add_files(file_map)
       end


Mime
View raw message