Bump Mongoid to ~> v6.0, bump gem version, update readme accordingly (#…

…124)
activeadmin · Jun 20, 2018 · 0a37baf · 0a37baf
1 parent 2068228
commit 0a37baf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: ruby
 services:
   - mongodb
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
diff --git a/README.md b/README.md
@@ -4,19 +4,17 @@
 
 ActiveAdmin is holding off on pulling Mongoid support into the core ActiveAdmin application.  This repo was pulled into the ActiveAdmin org from previous work done by Elia Schito, and will be maintained by Nic Boie, JD Guzman, Elia Schito and other ActiveAdmin and community members.
 
-### Requirements for version 0.4.0
+### Requirements for version 0.6.0
 * Ruby 2.2.2 or greater. (Note, ruby-2.4.0 fails specs, see [this issue](https://github.com/DatabaseCleaner/database_cleaner/issues/466))
 * Requires Rails 5.0.x (also tested working on Rails 5.1.x)
-* Mongoid 6.0.x
+* Mongoid 6.x (**WARNING**:, using a Mongoid version >= 6.1.x has resulted in a fair amount of errors seen in the wild.  Test your upgrade very carefully with any apps in which you're using this gem with Mongoid >= 6.1.x!)
 * ActiveAdmin 1.1 (Not working above 1.1.0 at this time)
 
 ## Previous versions
 * Rails 4.x with Mongoid 5.x use branch rails4-mongoid5
 * Rails 4.x with Mongoid 4.x branch rails4
 * Mongoid 3.x with older versions of rails use v 0.3.0
 
-#### Rails 4 with
-
 ## ♻️ INFO
 
 This gem has been brought into the ActiveAdmin org for support and maintenance.  

diff --git a/activeadmin-mongoid.gemspec b/activeadmin-mongoid.gemspec
@@ -18,11 +18,10 @@ Gem::Specification.new do |gem|
   gem.version       = ActiveAdmin::Mongoid::VERSION
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'mongoid',     ['~> 6.0.3']
+  gem.add_runtime_dependency 'mongoid',     ['~> 6.0']
   gem.add_runtime_dependency 'activeadmin', ['<= 1.1.0']
   gem.add_runtime_dependency 'jquery-rails'
   gem.add_runtime_dependency 'sass-rails',  ['>= 3.1.4', '<= 5.0.6']
-  # gem.add_runtime_dependency 'meta_search',  '~> 1.1.3'
 
   gem.add_development_dependency 'rspec-rails',  '~> 3.6'
   gem.add_development_dependency 'simplecov'

diff --git a/lib/active_admin/mongoid/version.rb b/lib/active_admin/mongoid/version.rb
@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Mongoid
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end