Merge pull request #158 from omniauth/bson-5.1

pboling · web-flow · commit 555c7a236670 · 2025-07-29T05:28:04.000+07:00
⬆️ bson v5.1.1
diff --git a/.rubocop_gradual.lock b/.rubocop_gradual.lock
@@ -1,5 +1,5 @@
 {
-  "README.md:3239175719": [
+  "README.md:409607445": [
     [201, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
   ],
   "Rakefile:3407355619": [
diff --git a/Appraisals b/Appraisals
@@ -295,7 +295,7 @@ end
 appraise "mongoid-8.1-r3.0" do
   gem "mongoid", "~> 8.1", ">= 8.1.7"
   gem "mongoid-rspec", "~> 4.2"
-  eval_gemfile "modular/bson/r3/v5.0.gemfile"
+  eval_gemfile "modular/bson/r3/v5.1.gemfile"
 
   eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
@@ -312,7 +312,7 @@ end
 appraise "mongoid-8.1-r3" do
   gem "mongoid", "~> 8.1", ">= 8.1.7"
   gem "mongoid-rspec", "~> 4.2"
-  eval_gemfile "modular/bson/r3/v5.0.gemfile"
+  eval_gemfile "modular/bson/r3/v5.1.gemfile"
 
   eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
@@ -367,7 +367,7 @@ end
 appraise "mongoid-9.0-r3.0" do
   gem "mongoid", "~> 9.0", ">= 9.0.3"
   gem "mongoid-rspec", "~> 4.2"
-  eval_gemfile "modular/bson/r3/v5.0.gemfile"
+  eval_gemfile "modular/bson/r3/v5.1.gemfile"
 
   eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
@@ -387,7 +387,7 @@ end
 appraise "mongoid-9.0-r3" do
   gem "mongoid", "~> 9.0", ">= 9.0.3"
   gem "mongoid-rspec", "~> 4.2"
-  eval_gemfile "modular/bson/r3/v5.0.gemfile"
+  eval_gemfile "modular/bson/r3/v5.1.gemfile"
 
   eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
@@ -505,7 +505,7 @@ appraise "coverage" do
   gem "mongoid", "~> 9.0", ">= 9.0.3"
   gem "mongoid-rspec", "~> 4.2"
   eval_gemfile "modular/activerecord/r3/v8.0.gemfile"
-  eval_gemfile "modular/bson/r3/v5.0.gemfile"
+  eval_gemfile "modular/bson/r3/v5.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
   eval_gemfile "modular/coverage.gemfile"
   gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
diff --git a/Gemfile b/Gemfile
@@ -47,8 +47,3 @@ platform :mri do
   ### Debugging (MRI Only)
   gem "byebug", ">= 11"
 end
-
-# TODO: Remove this once fixed in upstream bson (> 5.0.2)
-# Fix that is only needed on systems with GCC v15+
-# See: https://github.com/mongodb/bson-ruby/pull/355
-eval_gemfile "gemfiles/modular/bson/vHEAD.gemfile"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/mongodb/bson-ruby
-  revision: a349e14423012c51c3d5134711edaa639bd5bd42
-  branch: master
-  specs:
-    bson (5.1.1)
-      base64
-      bigdecimal
-      ostruct
-
 GIT
   remote: https://github.com/pboling/yard-junk
   revision: 54ccebabbfa9a9cd44d0b991687ebbfd22c32b55
@@ -65,6 +55,7 @@ GEM
     bcrypt (3.1.20)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
+    bson (5.1.1)
     bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
@@ -431,7 +422,6 @@ DEPENDENCIES
   anonymous_active_record (~> 1.0, >= 1.0.9)
   appraisal2 (~> 3.0)
   benchmark (~> 0.4, >= 0.4.1)
-  bson!
   bundler-audit (~> 0.9.2)
   byebug (>= 11)
   couch_potato (~> 1.17)
diff --git a/gemfiles/coverage.gemfile b/gemfiles/coverage.gemfile
@@ -12,7 +12,7 @@ gemspec path: "../"
 
 eval_gemfile("modular/activerecord/r3/v8.0.gemfile")
 
-eval_gemfile("modular/bson/r3/v5.0.gemfile")
+eval_gemfile("modular/bson/r3/v5.1.gemfile")
 
 eval_gemfile("modular/omniauth/r3/v2.1.gemfile")
 
diff --git a/gemfiles/modular/bson/r3/v5.0.gemfile b/gemfiles/modular/bson/r3/v5.0.gemfile
diff --git a/gemfiles/modular/bson/r3/v5.1.gemfile b/gemfiles/modular/bson/r3/v5.1.gemfile
@@ -0,0 +1,2 @@
+# Ruby >= 2.6
+gem "bson", "~> 5.1", ">= 5.1.1"
diff --git a/gemfiles/mongoid_8.1_r3.0.gemfile b/gemfiles/mongoid_8.1_r3.0.gemfile
@@ -7,7 +7,7 @@ gem "mongoid-rspec", "~> 4.2"
 
 gemspec path: "../"
 
-eval_gemfile("modular/bson/r3/v5.0.gemfile")
+eval_gemfile("modular/bson/r3/v5.1.gemfile")
 
 eval_gemfile("modular/activerecord/r3/v7.1.gemfile")
 
diff --git a/gemfiles/mongoid_8.1_r3.gemfile b/gemfiles/mongoid_8.1_r3.gemfile
@@ -7,7 +7,7 @@ gem "mongoid-rspec", "~> 4.2"
 
 gemspec path: "../"
 
-eval_gemfile("modular/bson/r3/v5.0.gemfile")
+eval_gemfile("modular/bson/r3/v5.1.gemfile")
 
 eval_gemfile("modular/activerecord/r3/v7.1.gemfile")
 
diff --git a/gemfiles/mongoid_9.0_r3.0.gemfile b/gemfiles/mongoid_9.0_r3.0.gemfile
@@ -8,7 +8,7 @@ gem "ostruct", "~> 0.6", ">= 0.6.1"
 
 gemspec path: "../"
 
-eval_gemfile("modular/bson/r3/v5.0.gemfile")
+eval_gemfile("modular/bson/r3/v5.1.gemfile")
 
 eval_gemfile("modular/activerecord/r3/v7.1.gemfile")
 
diff --git a/gemfiles/mongoid_9.0_r3.gemfile b/gemfiles/mongoid_9.0_r3.gemfile
@@ -8,7 +8,7 @@ gem "ostruct", "~> 0.6", ">= 0.6.1"
 
 gemspec path: "../"
 
-eval_gemfile("modular/bson/r3/v5.0.gemfile")
+eval_gemfile("modular/bson/r3/v5.1.gemfile")
 
 eval_gemfile("modular/activerecord/r3/v7.1.gemfile")
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "README.md:3239175719": [`
	`2`	`+ "README.md:409607445": [`
`3`	`3`	[201, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
`4`	`4`	`],`
`5`	`5`	`"Rakefile:3407355619": [`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Ruby >= 2.6`
	`2`	`+gem "bson", "~> 5.1", ">= 5.1.1"`