Update gemfiles and travis config to latest versions

countries · Mar 3, 2016 · 9543a75 · 9543a75
1 parent 57d0268
commit 9543a75
Show file tree

Hide file tree

Showing 7 changed files with 209 additions and 191 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,9 @@ script: "bundle exec rspec"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - jruby-19mode
   - jruby-head
   - rbx-2

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    country_select (2.5.1)
+    country_select (2.5.2)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 
@@ -26,7 +26,7 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     coderay (1.1.0)
-    countries (1.2.1)
+    countries (1.2.5)
       currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
     currencies (0.4.2)
@@ -290,4 +290,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.10.6
+   1.11.2
diff --git a/gemfiles/actionpack.edge.gemfile.lock b/gemfiles/actionpack.edge.gemfile.lock
@@ -1,40 +1,40 @@
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 186418724c6da41caeb0fd304894bcfcc154b8bb
+  revision: cd73632d9d47752013f46e775e59241215cfd8e9
   specs:
-    actionpack (5.0.0.alpha)
-      actionview (= 5.0.0.alpha)
-      activesupport (= 5.0.0.alpha)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
+    actionpack (5.0.0.beta3)
+      actionview (= 5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+      rack (~> 2.x)
+      rack-test (~> 0.6.3)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (5.0.0.alpha)
-      activesupport (= 5.0.0.alpha)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activesupport (5.0.0.alpha)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (5.0.0.beta3)
+      concurrent-ruby (~> 1.0)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
 
 PATH
   remote: ../
   specs:
-    country_select (2.5.1)
+    country_select (2.5.2)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    coderay (1.1.0)
-    countries (1.2.1)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.1)
+    countries (1.2.5)
       currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
     currencies (0.4.2)
@@ -43,45 +43,47 @@ GEM
     ffi2-generators (0.1.1)
     i18n (0.7.0)
     i18n_data (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    pry (0.10.1)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    psych (2.0.12)
-    racc (1.4.12)
-    rack (1.6.0)
+    psych (2.0.17)
+    racc (1.4.14)
+    rack (2.0.0.alpha)
+      json
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rubysl (2.1.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubysl (2.2.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -166,6 +168,7 @@ GEM
       rubysl-tmpdir (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
+      rubysl-unicode_normalize (~> 2.0)
       rubysl-uri (~> 2.0)
       rubysl-weakref (~> 2.0)
       rubysl-webrick (~> 2.0)
@@ -177,7 +180,7 @@ GEM
     rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
     rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
+    rubysl-cgi-session (2.1.0)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
@@ -187,7 +190,7 @@ GEM
     rubysl-curses (2.0.1)
     rubysl-date (2.0.9)
     rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
+    rubysl-digest (2.0.8)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
@@ -237,19 +240,19 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.2.1)
+    rubysl-openssl (2.8.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.1.0)
+    rubysl-ostruct (2.1.0)
+    rubysl-pathname (2.3)
     rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
     rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
-    rubysl-resolv (2.1.0)
+    rubysl-resolv (2.1.2)
     rubysl-rexml (2.0.4)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
@@ -258,14 +261,15 @@ GEM
     rubysl-set (2.0.1)
     rubysl-shellwords (2.0.0)
     rubysl-singleton (2.0.0)
-    rubysl-socket (2.0.1)
-    rubysl-stringio (2.0.0)
+    rubysl-socket (2.1.1)
+      rubysl-fcntl (~> 2.0)
+    rubysl-stringio (2.1.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
     rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.2)
+    rubysl-thread (2.0.3)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
@@ -274,6 +278,7 @@ GEM
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
       rubysl-optparse (~> 2.0)
+    rubysl-unicode_normalize (2.0)
     rubysl-uri (2.0.0)
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
@@ -283,11 +288,11 @@ GEM
     slop (3.6.0)
     sort_alphabetical (1.0.2)
       unicode_utils (>= 1.2.2)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicode_utils (1.4.0)
-    wwtd (0.7.0)
+    wwtd (1.3.0)
 
 PLATFORMS
   ruby
@@ -306,4 +311,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.10.6
+   1.11.2