Merge pull request #26 from jakedouglas/rails_6

Rails 6 support

.travis.yml

@@ -14,16 +14,14 @@ script:
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 rvm:
-  - 2.3.8
-  - 2.4.5
   - 2.5.3
   - 2.6.0
   - ruby-head
 gemfile:
   - Gemfile
-  - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.2.gemfile
+  - gemfiles/activerecord_6.0.gemfile
 matrix:
   allow_failures:
     - rvm: ruby-head

Appraisals

@@ -12,3 +12,8 @@ appraise 'activerecord-5.2' do
   gem 'activerecord', '~> 5.2.0'
   gem 'activesupport', '~> 5.2.0'
 end
+
+appraise 'activerecord-6.0' do
+  gem 'activerecord', '~> 6.0.0'
+  gem 'activesupport', '~> 6.0.0'
+end

easy_tags.gemspec

@@ -27,15 +27,15 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '~> 5.0'
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0', '< 6.1'
+  spec.add_runtime_dependency 'activesupport', '>= 5.0', '< 6.1'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-console'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3'
 end
 # rubocop:enable Metrics/BlockLength

gemfiles/activerecord_5.1.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.1.0'
-gem 'activesupport', '~> 5.1.0'
+gem "activerecord", "~> 5.1.0"
+gem "activesupport", "~> 5.1.0"
 
-gemspec path: '../'
+gemspec path: "../"

gemfiles/activerecord_5.2.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.2.0'
-gem 'activesupport', '~> 5.2.0'
+gem "activerecord", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"
 
-gemspec path: '../'
+gemspec path: "../"

gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
+
+gemspec path: "../"

lib/easy_tags/version.rb

@@ -1,3 +1,3 @@
 module EasyTags
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end