Merge pull request #290 from wordpress-mobile/revert-activesearch-v6-bump

Revert activesupport version bump

Author: AliSoftware

CHANGELOG.md

@@ -19,7 +19,7 @@ _None_
 
 ### Internal Changes
 
-* Update the `BigDecimal` and `ActiveSupport` gems to clean up our `Gemfile` and improve future compatibility.
+_None_
 
 ## 1.3.1
 

Gemfile.lock

@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     fastlane-plugin-wpmreleasetoolkit (1.3.1)
-      activesupport (~> 6.0)
-      bigdecimal (~> 2.0)
+      activesupport (~> 5)
+      bigdecimal (~> 1.4)
       chroma (= 0.2.0)
       diffy (~> 3.3)
       git (~> 1.3)
@@ -19,14 +19,16 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.3)
-    activesupport (6.1.4)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     artifactory (3.0.15)
     ast (2.4.2)
     atomos (0.1.3)
@@ -47,13 +49,50 @@ GEM
     aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    bigdecimal (2.0.3)
+    bigdecimal (1.4.4)
     chroma (0.2.0)
     claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
+    cocoapods (1.10.2)
+      addressable (~> 2.6)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.10.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.2)
+      activesupport (> 5.0, < 6)
+      addressable (~> 2.6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.4.0)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-trunk (1.5.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
     codecov (0.5.2)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
@@ -83,7 +122,6 @@ GEM
       danger
       rubocop (~> 1.0)
     declarative (0.0.20)
-    diff-lcs (1.4.4)
     diffy (3.4.0)
     digest-crc (0.6.3)
       rake (>= 12.0.0, < 14.0.0)
@@ -92,6 +130,9 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.2)
+    escape (0.0.4)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
     excon (0.81.0)
     faraday (1.4.2)
       faraday-em_http (~> 1.0)
@@ -152,6 +193,9 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
+    ffi (1.15.3)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.8.1)
       rchardet (~> 1.8)
@@ -217,11 +261,13 @@ GEM
     mini_mime (1.1.0)
     mini_portile2 (2.5.3)
     minitest (5.14.4)
+    molinillo (0.6.6)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
+    netrc (0.11.0)
     no_proxy_fix (0.1.2)
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
@@ -260,18 +306,8 @@ GEM
     rexml (3.2.5)
     rmagick (4.2.2)
     rouge (2.0.7)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -291,6 +327,7 @@ GEM
     rubocop-rspec (2.3.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
+    ruby-macho (1.4.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
@@ -313,13 +350,16 @@ GEM
     simplecov-html (0.10.2)
     terminal-notifier (2.0.0)
     terminal-table (1.6.0)
+    thread_safe (0.3.6)
     trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
@@ -342,21 +382,20 @@ GEM
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
     yard (0.9.26)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
+  cocoapods (~> 1.10)
   codecov
   danger (~> 8.0)
   danger-rubocop (~> 0.6)
   fastlane (~> 2)
   fastlane-plugin-wpmreleasetoolkit!
   pry (~> 0.12.2)
   rmagick (~> 4.1)
-  rspec
   rspec_junit_formatter (~> 0.4.1)
   rubocop (~> 1.0)
   rubocop-require_tools (~> 0.1.2)
@@ -366,4 +405,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.22
+   2.2.23

fastlane-plugin-wpmreleasetoolkit.gemspec

@@ -43,8 +43,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'progress_bar', '~> 1.3'
   spec.add_dependency 'parallel', '~> 1.14'
   spec.add_dependency 'chroma', '0.2.0'
-  spec.add_dependency 'activesupport', '~> 6.0'
-  spec.add_dependency 'bigdecimal', '~> 2.0'
+  spec.add_dependency 'activesupport', '~> 5'
+  # Some of the upstream code uses `BigDecimal.new` which version 2.0 of the
+  # `bigdecimal` gem removed. Until we'll find the time to identify the
+  # dependencies and see if we can move them to something compatible with
+  # modern `bigdecimal`, let's constrain the gem to a version still supporting
+  # `.new` but which warns about it deprecation.
+  spec.add_dependency 'bigdecimal', '~> 1.4'
 
   spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'bundler', '~> 2.0'
@@ -56,4 +61,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'fastlane', '~> 2'
   spec.add_development_dependency 'rmagick', '~> 4.1'
+  spec.add_development_dependency 'cocoapods', '~> 1.10'
 end