diff --git a/Gemfile b/Gemfile index e9b4cc2be6d7..e7162a4dadb6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,17 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version ruby ">= 2.6.10" +# concurrent-ruby >= 1.3.5 no longer requires 'logger', and activesupport 6.1.x +# references Logger without requiring it, so `bundle exec pod` crashes with +# "uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger". A bare +# `gem 'logger'` is not enough because bundler does not auto-require Gemfile gems; +# require it here so it is loaded before cocoapods loads active_support. +require 'logger' + gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' gem 'xcodeproj', '< 1.26.0' -gem 'concurrent-ruby', '<= 1.3.4' +gem 'concurrent-ruby', '>= 1.3.7' # Ruby 3.4.0 has removed some libraries from the standard library. gem 'bigdecimal' diff --git a/Gemfile.lock b/Gemfile.lock index 8eb0039d4c08..cc3096498876 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.7) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) @@ -97,7 +97,7 @@ DEPENDENCIES benchmark bigdecimal cocoapods (~> 1.13, != 1.15.1, != 1.15.0) - concurrent-ruby (<= 1.3.4) + concurrent-ruby (>= 1.3.7) logger mutex_m xcodeproj (< 1.26.0) diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile index c8b1aad6c2f3..f81cbd110085 100644 --- a/packages/rn-tester/Gemfile +++ b/packages/rn-tester/Gemfile @@ -3,13 +3,20 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version ruby ">= 2.6.10" +# concurrent-ruby >= 1.3.5 no longer requires 'logger', and activesupport 6.1.x +# references Logger without requiring it, so `bundle exec pod` crashes with +# "uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger". A bare +# `gem 'logger'` is not enough because bundler does not auto-require Gemfile gems; +# require it here so it is loaded before cocoapods loads active_support. +require 'logger' + # Cocoapods 1.15 introduced a bug which break the build. We will remove the upper # bound in the template on Cocoapods with next React Native release. gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1' gem 'rexml' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' gem 'xcodeproj', '< 1.26.0' -gem 'concurrent-ruby', '<= 1.3.4' +gem 'concurrent-ruby', '>= 1.3.7' # Ruby 3.4.0 has removed some libraries from the standard library. gem 'bigdecimal' diff --git a/private/helloworld/Gemfile b/private/helloworld/Gemfile index 4fbe0d436d40..b694d98f521a 100644 --- a/private/helloworld/Gemfile +++ b/private/helloworld/Gemfile @@ -2,10 +2,17 @@ source 'https://rubygems.org' ruby ">= 2.6.10" +# concurrent-ruby >= 1.3.5 no longer requires 'logger', and activesupport 6.1.x +# references Logger without requiring it, so `bundle exec pod` crashes with +# "uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger". A bare +# `gem 'logger'` is not enough because bundler does not auto-require Gemfile gems; +# require it here so it is loaded before cocoapods loads active_support. +require 'logger' + gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' gem 'xcodeproj', '< 1.26.0' -gem 'concurrent-ruby', '<= 1.3.4' +gem 'concurrent-ruby', '>= 1.3.7' # Ruby 3.4.0 has removed some libraries from the standard library. gem 'bigdecimal' diff --git a/private/helloworld/Gemfile.lock b/private/helloworld/Gemfile.lock index 30ada298ab8a..18811995a299 100644 --- a/private/helloworld/Gemfile.lock +++ b/private/helloworld/Gemfile.lock @@ -58,7 +58,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.7) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) @@ -101,7 +101,7 @@ DEPENDENCIES benchmark bigdecimal cocoapods (~> 1.13, != 1.15.1, != 1.15.0) - concurrent-ruby (<= 1.3.4) + concurrent-ruby (>= 1.3.7) ffi (>= 1.17.2) logger mutex_m