Merge pull request #451 from activeadmin/release/1.9.0

Prepare for release 1.9.0
activeadmin · Aug 10, 2018 · 44276af · 44276af
2 parents 743962e + 6904664
commit 44276af
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,18 @@
 language: ruby
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
-  - jruby-9.1.7.0
+  - jruby-9.1.16.0
+
 gemfile:
   - test/gemfiles/Gemfile-Rails-4-2
   - test/gemfiles/Gemfile-Rails-5-0
   - test/gemfiles/Gemfile-Rails-5-1
   - test/gemfiles/Gemfile-Rails-5-2
+
+matrix:
+  fast_finish: true
+
+  allow_failures:
+    - rvm: jruby-9.1.16.0
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,12 @@
 # Master (unreleased)
 
+# Version 1.9.0
+
+* Support Rails 5.2.1
+* Remove support for Ruby < 2.3
+
+# Version 1.8.0
+
 * Support Rails 5.2
 * Supports Ruby 2.4
 * Remove support for Ruby < 2.2, Rails < 4.2

diff --git a/Gemfile b/Gemfile
diff --git a/inherited_resources.gemspec b/inherited_resources.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files         = Dir["app/**/*", "lib/**/*", "README.md", "MIT-LICENSE"]
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.3'
 
   s.add_dependency("responders")
   s.add_dependency("actionpack", ">= 4.2", "< 5.3")

diff --git a/lib/inherited_resources/version.rb b/lib/inherited_resources/version.rb
@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.9.0'.freeze
 end
diff --git a/test/gemfiles/Gemfile-Rails-3-2 b/test/gemfiles/Gemfile-Rails-3-2
diff --git a/test/gemfiles/Gemfile-Rails-4-0 b/test/gemfiles/Gemfile-Rails-4-0
diff --git a/test/gemfiles/Gemfile-Rails-4-1 b/test/gemfiles/Gemfile-Rails-4-1
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -4,7 +4,7 @@
 Bundler.setup
 
 require 'minitest/autorun'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 require 'minitest/rg'
 
 ENV["RAILS_ENV"] = "test"