Merge pull request #43 from sue445/feature/fix_ci

Fix CI for ruby 2.5+
sue445 · Aug 23, 2019 · 255c21a · 255c21a
2 parents 99a33e4 + 4ca0f17
commit 255c21a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,24 @@ source 'https://rubygems.org'
 gemspec
 
 if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
+  # NOTE: rails 5+ requires Ruby 2.2.2+
   gem "activerecord", "< 5.0.0"
   gem "activesupport", "< 5.0.0"
+
+  # https://github.com/rails/rails/blob/v4.2.11.1/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L5
+  gem "sqlite3", "~> 1.3.6"
+
+elsif Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
+  # NOTE: rails 6+ requires Ruby 2.5.0+
+  gem "activerecord", "< 6.0.0"
+  gem "activesupport", "< 6.0.0"
+
+  # https://github.com/rails/rails/blob/v5.2.3/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+  gem "sqlite3", "~> 1.3.6"
+
+else
+  # https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+  gem "sqlite3", "~> 1.4"
 end
 
 if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")

diff --git a/heart_seed.gemspec b/heart_seed.gemspec
@@ -38,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-parameterized"
   spec.add_development_dependency "rspec-temp_dir"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "sqlite3", "~> 1.3.6"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "yard"
 end
-