From 95098f75b861d29755756f0a497a2877f111e408 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 1 Jul 2016 09:05:46 -0400 Subject: [PATCH] Appraise against Rails 5.0 --- Appraisals | 2 +- gemfiles/3.2.gemfile.lock | 41 ++++++++++++-------------------- gemfiles/4.0.gemfile.lock | 28 +++++++--------------- gemfiles/4.1.gemfile.lock | 40 +++++++++++-------------------- gemfiles/4.2.gemfile.lock | 28 +++++++--------------- gemfiles/5.0.gemfile | 2 +- gemfiles/5.0.gemfile.lock | 50 +++++++++++++-------------------------- 7 files changed, 64 insertions(+), 127 deletions(-) diff --git a/Appraisals b/Appraisals index 55f6287..d5715eb 100644 --- a/Appraisals +++ b/Appraisals @@ -15,5 +15,5 @@ appraise '4.2' do end appraise '5.0' do - gem 'activerecord', "~> 5.0.0.beta2" + gem 'activerecord', "~> 5.0.0" end diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index 1fed2e1..6191428 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://github.com/rails/rails.git - revision: 9892626579d1c62c367e5344a1d1642708340f88 + revision: d4a1b33a2ab6703124926fbf805d77ef753e1b87 branch: 3-2-stable specs: - activemodel (3.2.22.1) - activesupport (= 3.2.22.1) + activemodel (3.2.22.2) + activesupport (= 3.2.22.2) builder (~> 3.0.0) - activerecord (3.2.22.1) - activemodel (= 3.2.22.1) - activesupport (= 3.2.22.1) + activerecord (3.2.22.2) + activemodel (= 3.2.22.2) + activesupport (= 3.2.22.2) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activesupport (3.2.22.1) + activesupport (3.2.22.2) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) @@ -24,17 +24,12 @@ PATH GEM remote: https://rubygems.org/ specs: - activerecord-jdbc-adapter (1.3.19) - activerecord (>= 2.2) - activerecord-jdbcsqlite3-adapter (1.3.19) - activerecord-jdbc-adapter (~> 1.3.19) - jdbc-sqlite3 (>= 3.7.2, < 3.9) appraisal (2.1.0) bundler rake thor (>= 0.14.0) arel (3.0.3) - aruba (0.13.0) + aruba (0.14.1) childprocess (~> 0.5.6) contracts (~> 0.9) cucumber (>= 1.3.19) @@ -46,7 +41,7 @@ GEM builder (3.0.4) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - contracts (0.13.0) + contracts (0.14.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -56,26 +51,21 @@ GEM diff-lcs (1.2.5) docile (1.1.5) ffi (1.9.10) - ffi (1.9.10-java) gherkin (2.12.2) multi_json (~> 1.3) - gherkin (2.12.2-java) - multi_json (~> 1.3) i18n (0.7.0) - jdbc-sqlite3 (3.8.11.2) json (1.8.3) - json (1.8.3-java) metaclass (0.0.4) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.2) + multi_json (1.12.1) multi_test (0.1.2) - rake (10.5.0) + rake (11.2.2) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -94,12 +84,11 @@ GEM simplecov-html (0.10.0) sqlite3 (1.3.11) thor (0.19.1) - timecop (0.8.0) - tzinfo (0.3.46) + timecop (0.8.1) + tzinfo (0.3.50) yard (0.8.7.6) PLATFORMS - java ruby DEPENDENCIES @@ -120,4 +109,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/gemfiles/4.0.gemfile.lock b/gemfiles/4.0.gemfile.lock index 67b7c70..c814092 100644 --- a/gemfiles/4.0.gemfile.lock +++ b/gemfiles/4.0.gemfile.lock @@ -16,11 +16,6 @@ GEM activesupport (= 4.0.13) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.4) - activerecord-jdbc-adapter (1.3.19) - activerecord (>= 2.2) - activerecord-jdbcsqlite3-adapter (1.3.19) - activerecord-jdbc-adapter (~> 1.3.19) - jdbc-sqlite3 (>= 3.7.2, < 3.9) activesupport (4.0.13) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) @@ -32,7 +27,7 @@ GEM rake thor (>= 0.14.0) arel (4.0.2) - aruba (0.13.0) + aruba (0.14.1) childprocess (~> 0.5.6) contracts (~> 0.9) cucumber (>= 1.3.19) @@ -44,7 +39,7 @@ GEM builder (3.1.4) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - contracts (0.13.0) + contracts (0.14.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -54,27 +49,22 @@ GEM diff-lcs (1.2.5) docile (1.1.5) ffi (1.9.10) - ffi (1.9.10-java) gherkin (2.12.2) multi_json (~> 1.3) - gherkin (2.12.2-java) - multi_json (~> 1.3) i18n (0.7.0) - jdbc-sqlite3 (3.8.11.2) json (1.8.3) - json (1.8.3-java) metaclass (0.0.4) minitest (4.7.5) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.2) + multi_json (1.12.1) multi_test (0.1.2) - rake (10.5.0) + rake (11.2.2) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -94,13 +84,11 @@ GEM sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - thread_safe (0.3.5-java) - timecop (0.8.0) - tzinfo (0.3.46) + timecop (0.8.1) + tzinfo (0.3.50) yard (0.8.7.6) PLATFORMS - java ruby DEPENDENCIES @@ -121,4 +109,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock index 1efb72e..b1e343d 100644 --- a/gemfiles/4.1.gemfile.lock +++ b/gemfiles/4.1.gemfile.lock @@ -7,19 +7,14 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (4.1.14.1) - activesupport (= 4.1.14.1) + activemodel (4.1.15) + activesupport (= 4.1.15) builder (~> 3.1) - activerecord (4.1.14.1) - activemodel (= 4.1.14.1) - activesupport (= 4.1.14.1) + activerecord (4.1.15) + activemodel (= 4.1.15) + activesupport (= 4.1.15) arel (~> 5.0.0) - activerecord-jdbc-adapter (1.3.19) - activerecord (>= 2.2) - activerecord-jdbcsqlite3-adapter (1.3.19) - activerecord-jdbc-adapter (~> 1.3.19) - jdbc-sqlite3 (>= 3.7.2, < 3.9) - activesupport (4.1.14.1) + activesupport (4.1.15) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -30,7 +25,7 @@ GEM rake thor (>= 0.14.0) arel (5.0.1.20140414130214) - aruba (0.13.0) + aruba (0.14.1) childprocess (~> 0.5.6) contracts (~> 0.9) cucumber (>= 1.3.19) @@ -42,7 +37,7 @@ GEM builder (3.2.2) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - contracts (0.13.0) + contracts (0.14.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -52,27 +47,22 @@ GEM diff-lcs (1.2.5) docile (1.1.5) ffi (1.9.10) - ffi (1.9.10-java) gherkin (2.12.2) multi_json (~> 1.3) - gherkin (2.12.2-java) - multi_json (~> 1.3) i18n (0.7.0) - jdbc-sqlite3 (3.8.11.2) json (1.8.3) - json (1.8.3-java) metaclass (0.0.4) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.2) + multi_json (1.12.1) multi_test (0.1.2) - rake (10.5.0) + rake (11.2.2) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -92,14 +82,12 @@ GEM sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - thread_safe (0.3.5-java) - timecop (0.8.0) + timecop (0.8.1) tzinfo (1.2.2) thread_safe (~> 0.1) yard (0.8.7.6) PLATFORMS - java ruby DEPENDENCIES @@ -120,4 +108,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock index 2dfe26e..93fb4ad 100644 --- a/gemfiles/4.2.gemfile.lock +++ b/gemfiles/4.2.gemfile.lock @@ -14,11 +14,6 @@ GEM activemodel (= 4.2.5.1) activesupport (= 4.2.5.1) arel (~> 6.0) - activerecord-jdbc-adapter (1.3.19) - activerecord (>= 2.2) - activerecord-jdbcsqlite3-adapter (1.3.19) - activerecord-jdbc-adapter (~> 1.3.19) - jdbc-sqlite3 (>= 3.7.2, < 3.9) activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -30,7 +25,7 @@ GEM rake thor (>= 0.14.0) arel (6.0.3) - aruba (0.13.0) + aruba (0.14.1) childprocess (~> 0.5.6) contracts (~> 0.9) cucumber (>= 1.3.19) @@ -42,7 +37,7 @@ GEM builder (3.2.2) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - contracts (0.13.0) + contracts (0.14.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -52,27 +47,22 @@ GEM diff-lcs (1.2.5) docile (1.1.5) ffi (1.9.10) - ffi (1.9.10-java) gherkin (2.12.2) multi_json (~> 1.3) - gherkin (2.12.2-java) - multi_json (~> 1.3) i18n (0.7.0) - jdbc-sqlite3 (3.8.11.2) json (1.8.3) - json (1.8.3-java) metaclass (0.0.4) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.2) + multi_json (1.12.1) multi_test (0.1.2) - rake (10.5.0) + rake (11.2.2) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -92,14 +82,12 @@ GEM sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - thread_safe (0.3.5-java) - timecop (0.8.0) + timecop (0.8.1) tzinfo (1.2.2) thread_safe (~> 0.1) yard (0.8.7.6) PLATFORMS - java ruby DEPENDENCIES @@ -120,4 +108,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile index 055face..85022c3 100644 --- a/gemfiles/5.0.gemfile +++ b/gemfiles/5.0.gemfile @@ -5,6 +5,6 @@ source "https://rubygems.org" gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby gem "jdbc-sqlite3", :platforms => :jruby gem "sqlite3", "~> 1.3.10", :platforms => :ruby -gem "activerecord", "~> 5.0.0.beta2" +gem "activerecord", "~> 5.0.0" gemspec :path => "../" diff --git a/gemfiles/5.0.gemfile.lock b/gemfiles/5.0.gemfile.lock index 377a12e..6275933 100644 --- a/gemfiles/5.0.gemfile.lock +++ b/gemfiles/5.0.gemfile.lock @@ -7,22 +7,15 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (5.0.0.beta2) - activesupport (= 5.0.0.beta2) - activerecord (5.0.0.beta2) - activemodel (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) arel (~> 7.0) - activerecord-jdbc-adapter (1.3.19) - activerecord (>= 2.2) - activerecord-jdbcsqlite3-adapter (1.3.19) - activerecord-jdbc-adapter (~> 1.3.19) - jdbc-sqlite3 (>= 3.7.2, < 3.9) - activesupport (5.0.0.beta2) - concurrent-ruby (~> 1.0) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - method_source minitest (~> 5.1) tzinfo (~> 1.1) appraisal (2.1.0) @@ -30,7 +23,7 @@ GEM rake thor (>= 0.14.0) arel (7.0.0) - aruba (0.13.0) + aruba (0.14.1) childprocess (~> 0.5.6) contracts (~> 0.9) cucumber (>= 1.3.19) @@ -42,9 +35,8 @@ GEM builder (3.2.2) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - concurrent-ruby (1.0.0) - concurrent-ruby (1.0.0-java) - contracts (0.13.0) + concurrent-ruby (1.0.2) + contracts (0.14.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -54,28 +46,22 @@ GEM diff-lcs (1.2.5) docile (1.1.5) ffi (1.9.10) - ffi (1.9.10-java) gherkin (2.12.2) multi_json (~> 1.3) - gherkin (2.12.2-java) - multi_json (~> 1.3) i18n (0.7.0) - jdbc-sqlite3 (3.8.11.2) json (1.8.3) - json (1.8.3-java) metaclass (0.0.4) - method_source (0.8.2) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.2) + multi_json (1.12.1) multi_test (0.1.2) - rake (10.5.0) + rake (11.2.2) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -95,18 +81,16 @@ GEM sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - thread_safe (0.3.5-java) - timecop (0.8.0) + timecop (0.8.1) tzinfo (1.2.2) thread_safe (~> 0.1) yard (0.8.7.6) PLATFORMS - java ruby DEPENDENCIES - activerecord (~> 5.0.0.beta2) + activerecord (~> 5.0.0) activerecord-jdbcsqlite3-adapter appraisal (~> 2.1.0) aruba @@ -123,4 +107,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.11.2 + 1.12.5