diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad7035f..f445ac3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,10 +14,6 @@ jobs: gemfile: gemfiles/rails60.gemfile - ruby: 2.6 gemfile: gemfiles/rails52.gemfile - - ruby: 2.5 - gemfile: gemfiles/rails51.gemfile - - ruby: 2.4 - gemfile: gemfiles/rails50.gemfile env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 75e2378..24ec385 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.3.0 (unreleased) - Disabled geocoding by default for new installations +- Removed support for Rails < 5.2 and Ruby < 2.6 ## 0.2.2 (2020-11-21) diff --git a/Gemfile b/Gemfile index a52bfb6..647d353 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,9 @@ source "https://rubygems.org" gemspec -gem "railties", "~> 6.1.0" -gem "activerecord", "~> 6.1.0" +gem "rake" +gem "minitest", ">= 5" +gem "combustion" +gem "rails", "~> 6.1.0" +gem "sqlite3" +gem "devise" diff --git a/LICENSE.txt b/LICENSE.txt index 2208645..ee290bc 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017-2020 Andrew Kane +Copyright (c) 2017-2021 Andrew Kane MIT License diff --git a/Rakefile b/Rakefile index 1d5c515..24c24d3 100644 --- a/Rakefile +++ b/Rakefile @@ -4,7 +4,7 @@ require "rake/testtask" Rake::TestTask.new(:test) do |t| t.libs << "test" t.test_files = FileList["test/**/*_test.rb"] - t.warning = false + t.warning = false # for devise end task default: :test diff --git a/authtrail.gemspec b/authtrail.gemspec index 3ef3cfe..afa445e 100644 --- a/authtrail.gemspec +++ b/authtrail.gemspec @@ -8,23 +8,15 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.author = "Andrew Kane" - spec.email = "andrew@chartkick.com" + spec.email = "andrew@ankane.org" spec.files = Dir["*.{md,txt}", "{app,lib}/**/*"] spec.require_path = "lib" - spec.required_ruby_version = ">= 2.4" + spec.required_ruby_version = ">= 2.6" - spec.add_dependency "railties", ">= 5" - spec.add_dependency "activerecord", ">= 5" + spec.add_dependency "railties", ">= 5.2" + spec.add_dependency "activerecord", ">= 5.2" spec.add_dependency "warden" spec.add_dependency "geocoder" - - spec.add_development_dependency "bundler" - spec.add_development_dependency "rake" - spec.add_development_dependency "minitest", ">= 5" - spec.add_development_dependency "combustion" - spec.add_development_dependency "rails" - spec.add_development_dependency "sqlite3" - spec.add_development_dependency "devise" end diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile deleted file mode 100644 index 6b77063..0000000 --- a/gemfiles/rails50.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -gemspec path: ".." - -gem "rails", "~> 5.0.0" -gem "sqlite3", "~> 1.3.0" diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile deleted file mode 100644 index 33a2daa..0000000 --- a/gemfiles/rails51.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source "https://rubygems.org" - -gemspec path: ".." - -gem "rails", "~> 5.1.0" diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index f193894..44783b9 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -2,4 +2,9 @@ source "https://rubygems.org" gemspec path: ".." +gem "rake" +gem "minitest", ">= 5" +gem "combustion" gem "rails", "~> 5.2.0" +gem "sqlite3" +gem "devise" diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index abff09a..beb50d9 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -2,4 +2,9 @@ source "https://rubygems.org" gemspec path: ".." +gem "rake" +gem "minitest", ">= 5" +gem "combustion" gem "rails", "~> 6.0.0" +gem "sqlite3" +gem "devise" diff --git a/test/test_helper.rb b/test/test_helper.rb index f2a9cb2..3ed8f85 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,5 @@ require "bundler/setup" -Bundler.require(:development) +Bundler.require require "minitest/autorun" require "minitest/pride"