Skip to content

Commit

Permalink
Point to the latest release of mongoid instead of 8-1 branch
Browse files Browse the repository at this point in the history 
Now that Mongoid has released new versions of 8.1 which contain the
changes we rely on for dirty tracking, we can just point our Gemfile to
their released versions for testing against them.

Also update Rails and related dependencies to latest in the process, to
make sure they all match together. (Mongoid v8.1.2 didn't allow Rails 7.1
for instance, only v8.1.3+)
  • Loading branch information
@carlosantoniodasilva
carlosantoniodasilva committed Apr 10, 2024
1 parent a2f1d29 commit d18d6d8
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 110 deletions.
9 changes: 1 addition & 8 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ platforms :ruby do
gem "sqlite3"
end

# platforms :jruby do
# gem "activerecord-jdbc-adapter"
# gem "activerecord-jdbcsqlite3-adapter"
# gem "jruby-openssl"
# end

group :mongoid do
# gem "mongoid", "~> 8.1"
gem "mongoid", github: "mongodb/mongoid", branch: "8.1-stable"
gem "mongoid", "~> 8.1"
end
192 changes: 93 additions & 99 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
GIT
remote: https://github.com/mongodb/mongoid.git
revision: c12a285f78b291e4c62256aee0cc767f83fdc080
branch: 8.1-stable
specs:
mongoid (8.1.2)
activemodel (>= 5.1, < 7.2, != 7.0.0)
concurrent-ruby (>= 1.0.5, < 2.0)
mongo (>= 2.18.0, < 3.0.0)
ruby2_keywords (~> 0.0.5)

GIT
remote: https://github.com/rails/rails-controller-testing.git
revision: c203673f8011a7cdc2a8edf995ae6b3eec3417ca
Expand All @@ -31,70 +20,71 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.1)
actionpack (= 7.1.1)
activesupport (= 7.1.1)
actioncable (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.1)
actionpack (= 7.1.1)
activejob (= 7.1.1)
activerecord (= 7.1.1)
activestorage (= 7.1.1)
activesupport (= 7.1.1)
actionmailbox (7.1.3.2)
actionpack (= 7.1.3.2)
activejob (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.1)
actionpack (= 7.1.1)
actionview (= 7.1.1)
activejob (= 7.1.1)
activesupport (= 7.1.1)
actionmailer (7.1.3.2)
actionpack (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activesupport (= 7.1.3.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.1)
actionview (= 7.1.1)
activesupport (= 7.1.1)
actionpack (7.1.3.2)
actionview (= 7.1.3.2)
activesupport (= 7.1.3.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.1)
actionpack (= 7.1.1)
activerecord (= 7.1.1)
activestorage (= 7.1.1)
activesupport (= 7.1.1)
actiontext (7.1.3.2)
actionpack (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.1)
activesupport (= 7.1.1)
actionview (7.1.3.2)
activesupport (= 7.1.3.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.1)
activesupport (= 7.1.1)
activejob (7.1.3.2)
activesupport (= 7.1.3.2)
globalid (>= 0.3.6)
activemodel (7.1.1)
activesupport (= 7.1.1)
activerecord (7.1.1)
activemodel (= 7.1.1)
activesupport (= 7.1.1)
activemodel (7.1.3.2)
activesupport (= 7.1.3.2)
activerecord (7.1.3.2)
activemodel (= 7.1.3.2)
activesupport (= 7.1.3.2)
timeout (>= 0.4.0)
activestorage (7.1.1)
actionpack (= 7.1.1)
activejob (= 7.1.1)
activerecord (= 7.1.1)
activesupport (= 7.1.1)
activestorage (7.1.3.2)
actionpack (= 7.1.3.2)
activejob (= 7.1.3.2)
activerecord (= 7.1.3.2)
activesupport (= 7.1.3.2)
marcel (~> 1.0)
activesupport (7.1.1)
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -104,17 +94,16 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
base64 (0.1.1)
base64 (0.2.0)
bcrypt (3.1.19)
bigdecimal (3.1.4)
bson (4.15.0)
bigdecimal (3.1.7)
bson (5.0.0)
builder (3.2.4)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.3)
drb (2.1.1)
ruby2_keywords
date (3.3.4)
drb (2.2.1)
erubi (1.12.0)
faraday (2.7.11)
base64
Expand All @@ -124,42 +113,47 @@ GEM
globalid (1.2.1)
activesupport (>= 6.1)
hashie (5.0.0)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
irb (1.8.2)
io-console (0.7.2)
irb (1.12.0)
rdoc
reline (>= 0.3.8)
reline (>= 0.4.2)
jwt (2.7.1)
loofah (2.21.4)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
marcel (1.0.4)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.20.0)
mini_portile2 (2.8.5)
minitest (5.22.3)
mocha (2.1.0)
ruby2_keywords (>= 0.0.5)
mongo (2.19.1)
bson (>= 4.14.1, < 5.0.0)
mongo (2.20.0)
bson (>= 4.14.1, < 6.0.0)
mongoid (8.1.5)
activemodel (>= 5.1, < 7.2, != 7.0.0)
concurrent-ruby (>= 1.0.5, < 2.0)
mongo (>= 2.18.0, < 3.0.0)
ruby2_keywords (~> 0.0.5)
multi_xml (0.6.0)
mutex_m (0.1.2)
net-imap (0.4.1)
mutex_m (0.2.0)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.5.0)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.4)
nio4r (2.7.1)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oauth2 (2.0.9)
Expand All @@ -182,10 +176,10 @@ GEM
omniauth (>= 1.0, < 3.0)
rack-openid (~> 1.4.0)
orm_adapter (0.5.0)
psych (5.1.1)
psych (5.1.2)
stringio
racc (1.7.1)
rack (3.0.8)
racc (1.7.3)
rack (3.0.10)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
Expand All @@ -198,39 +192,39 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.1)
actioncable (= 7.1.1)
actionmailbox (= 7.1.1)
actionmailer (= 7.1.1)
actionpack (= 7.1.1)
actiontext (= 7.1.1)
actionview (= 7.1.1)
activejob (= 7.1.1)
activemodel (= 7.1.1)
activerecord (= 7.1.1)
activestorage (= 7.1.1)
activesupport (= 7.1.1)
rails (7.1.3.2)
actioncable (= 7.1.3.2)
actionmailbox (= 7.1.3.2)
actionmailer (= 7.1.3.2)
actionpack (= 7.1.3.2)
actiontext (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activemodel (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
bundler (>= 1.15.0)
railties (= 7.1.1)
railties (= 7.1.3.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.1)
actionpack (= 7.1.1)
activesupport (= 7.1.1)
railties (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rake (13.0.6)
rdoc (6.5.0)
rake (13.2.1)
rdoc (6.6.3.1)
psych (>= 4.0.0)
reline (0.3.9)
reline (0.5.1)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
Expand All @@ -243,10 +237,10 @@ GEM
version_gem (~> 1.1, >= 1.1.1)
sqlite3 (1.6.7)
mini_portile2 (~> 2.8.0)
stringio (3.0.8)
thor (1.2.2)
stringio (3.1.0)
thor (1.3.1)
timecop (0.9.8)
timeout (0.4.0)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
version_gem (1.1.3)
Expand All @@ -260,15 +254,15 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.12)
zeitwerk (2.6.13)

PLATFORMS
ruby

DEPENDENCIES
devise!
mocha (~> 2.1)
mongoid!
mongoid (~> 8.1)
omniauth
omniauth-facebook
omniauth-oauth2
Expand All @@ -283,4 +277,4 @@ DEPENDENCIES
webrat (= 0.7.3)

BUNDLED WITH
2.4.5
2.4.22
5 changes: 2 additions & 3 deletions gemfiles/Gemfile-rails-main
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ group :test do
end

platforms :ruby do
gem "sqlite3", "~> 1.4"
gem "sqlite3"
end

group :mongoid do
# gem "mongoid", "~> 8.1"
gem "mongoid", github: "mongodb/mongoid", branch: "8.1-stable"
gem "mongoid", "~> 8.1"
end

0 comments on commit d18d6d8

Please sign in to comment.