diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ff653148..80662e54 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:50+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:37+00:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. version: 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0059a91b..22e8d75c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:50+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:37+00:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. name: RSpec CI diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 982d2ff9..bc9feb87 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:50+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:37+00:00 from the rspec-dev repo. # DO NOT modify it by hand as your changes will get lost the next time it is generated. # This file contains defaults for RSpec projects. Individual projects diff --git a/Gemfile b/Gemfile index bdf4efb9..847643a5 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,11 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp if File.exist?(library_path) && !ENV['USE_GIT_REPOS'] gem lib, :path => library_path else - gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch + if lib == 'rspec' + gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch + else + gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch + end end end @@ -27,6 +31,11 @@ else gem 'diff-lcs', '~> 1.4', '>= 1.4.3' end +if RUBY_VERSION >= '3.3.0' + # This is being extracted in Ruby 3.4 and issues a warning on 3.3 + gem 'bigdecimal', :require => false +end + if RUBY_VERSION < '2.3.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/) gem "childprocess", "< 1.0.0" elsif RUBY_VERSION < '2.0.0' diff --git a/lib/rspec/support/caller_filter.rb b/lib/rspec/support/caller_filter.rb index 0c4b37ce..e54b23aa 100644 --- a/lib/rspec/support/caller_filter.rb +++ b/lib/rspec/support/caller_filter.rb @@ -27,7 +27,7 @@ class CallerFilter # when `CallerFilter.first_non_rspec_line` is called from the top level of a required # file, but it depends on if rubygems is loaded or not. We don't want to have to deal # with this complexity in our `RSpec.deprecate` calls, so we ignore it here. - IGNORE_REGEX = Regexp.union(LIB_REGEX, "rubygems/core_ext/kernel_require.rb", "