From 2f02badea10b08b4d1ad60207965755b58f8cc59 Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Mon, 6 Jun 2022 15:02:06 -0400 Subject: [PATCH 1/4] Bump config to master ref Signed-off-by: Alexandre Terrasa --- Gemfile | 2 +- Gemfile.lock | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 0b6f6f673..024dd4985 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ group(:development, :test) do gem("shopify-money", require: false) gem("sidekiq", require: false) gem("nokogiri", require: false) - gem("config", require: false) + gem("config", github: "rubyconfig/config", branch: "master", require: false) gem("aasm", require: false) gem("bcrypt", require: false) gem("xpath", require: false) diff --git a/Gemfile.lock b/Gemfile.lock index 3671d1689..30b4eb99a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,6 +5,15 @@ GIT specs: cityhash (0.6.0) +GIT + remote: https://github.com/rubyconfig/config.git + revision: 740fe1fd235649e41d5813d5a618caa3969be13b + branch: master + specs: + config (4.0.0) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 1.0, >= 1.0.0) + PATH remote: . specs: @@ -107,16 +116,13 @@ GEM byebug (11.1.3) coderay (1.1.3) concurrent-ruby (1.1.10) - config (4.0.0) - deep_merge (~> 1.2, >= 1.2.1) - dry-validation (~> 1.0, >= 1.0.0) connection_pool (2.2.5) crass (1.0.6) dedup (0.1.4) deep_merge (1.2.2) diff-lcs (1.5.0) digest (3.1.0) - dry-configurable (0.13.0) + dry-configurable (0.15.0) concurrent-ruby (~> 1.0) dry-core (~> 0.6) dry-container (0.9.0) @@ -125,11 +131,11 @@ GEM dry-core (0.7.1) concurrent-ruby (~> 1.0) dry-inflector (0.2.1) - dry-initializer (3.0.4) + dry-initializer (3.1.1) dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.8.0) + dry-schema (1.9.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.13, >= 0.13.0) dry-core (~> 0.5, >= 0.5) @@ -142,7 +148,7 @@ GEM dry-core (~> 0.5, >= 0.5) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.7.0) + dry-validation (1.8.1) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) dry-core (~> 0.5, >= 0.5) @@ -331,7 +337,7 @@ DEPENDENCIES activeresource bcrypt cityhash! - config + config! frozen_record google-protobuf identity_cache From 3deb5a3b8419a8ca2cd3c6077b801b7b0687cb97 Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Mon, 6 Jun 2022 16:03:38 -0400 Subject: [PATCH 2/4] Bump frozen_record to master ref Signed-off-by: Alexandre Terrasa --- Gemfile | 2 +- Gemfile.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 024dd4985..da5701c93 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ end group(:development, :test) do gem("smart_properties", require: false) - gem("frozen_record", require: false) + gem("frozen_record", github: "byroot/frozen_record", branch: "master", require: false) gem("sprockets", require: false) gem("rails", require: false) gem("state_machines", require: false) diff --git a/Gemfile.lock b/Gemfile.lock index 30b4eb99a..d958dd241 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/byroot/frozen_record.git + revision: 4130a0600874aae2b8c83108053255d67f0cad08 + branch: master + specs: + frozen_record (0.23.0) + activemodel + dedup + GIT remote: https://github.com/csfrancis/cityhash.git revision: 3cfc7d01f333c01811d5e834f1495eaa29f87c36 @@ -155,9 +164,6 @@ GEM dry-initializer (~> 3.0) dry-schema (~> 1.8, >= 1.8.0) erubi (1.10.0) - frozen_record (0.23.0) - activemodel - dedup globalid (1.0.0) activesupport (>= 5.0) google-protobuf (3.21.1) @@ -338,7 +344,7 @@ DEPENDENCIES bcrypt cityhash! config! - frozen_record + frozen_record! google-protobuf identity_cache minitest From 4850d86264f1cf95faf4058223b61b7e2fd84a0d Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Mon, 6 Jun 2022 16:03:49 -0400 Subject: [PATCH 3/4] Remove temporary patch for Railtie Signed-off-by: Alexandre Terrasa --- tasks/generator_documentation.rake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tasks/generator_documentation.rake b/tasks/generator_documentation.rake index 5f97e25de..2813941f0 100644 --- a/tasks/generator_documentation.rake +++ b/tasks/generator_documentation.rake @@ -1,12 +1,6 @@ # typed: true # frozen_string_literal: true -# Temporary fix for CI -# A patch as been upstreamed, we're waiting for it to be merged. -# See https://github.com/rubyconfig/config/pull/319 -# TODO: remove this one the patch is released. -require "rails" - require "yard" require "tapioca" require "tapioca/runtime/reflection" From e47ebf1153965829dc5e681781d132167d5e5092 Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Mon, 6 Jun 2022 16:22:39 -0400 Subject: [PATCH 4/4] Update gem RBIs Signed-off-by: Alexandre Terrasa --- ... => config@4.0.0-740fe1fd235649e41d5813d5a618caa3969be13b.rbi} | 0 .../{dry-configurable@0.13.0.rbi => dry-configurable@0.15.0.rbi} | 0 .../gems/{dry-initializer@3.0.4.rbi => dry-initializer@3.1.1.rbi} | 0 sorbet/rbi/gems/{dry-schema@1.8.0.rbi => dry-schema@1.9.2.rbi} | 0 .../gems/{dry-validation@1.7.0.rbi => dry-validation@1.8.1.rbi} | 0 ...en_record@0.23.0-4130a0600874aae2b8c83108053255d67f0cad08.rbi} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename sorbet/rbi/gems/{config@4.0.0.rbi => config@4.0.0-740fe1fd235649e41d5813d5a618caa3969be13b.rbi} (100%) rename sorbet/rbi/gems/{dry-configurable@0.13.0.rbi => dry-configurable@0.15.0.rbi} (100%) rename sorbet/rbi/gems/{dry-initializer@3.0.4.rbi => dry-initializer@3.1.1.rbi} (100%) rename sorbet/rbi/gems/{dry-schema@1.8.0.rbi => dry-schema@1.9.2.rbi} (100%) rename sorbet/rbi/gems/{dry-validation@1.7.0.rbi => dry-validation@1.8.1.rbi} (100%) rename sorbet/rbi/gems/{frozen_record@0.23.0.rbi => frozen_record@0.23.0-4130a0600874aae2b8c83108053255d67f0cad08.rbi} (100%) diff --git a/sorbet/rbi/gems/config@4.0.0.rbi b/sorbet/rbi/gems/config@4.0.0-740fe1fd235649e41d5813d5a618caa3969be13b.rbi similarity index 100% rename from sorbet/rbi/gems/config@4.0.0.rbi rename to sorbet/rbi/gems/config@4.0.0-740fe1fd235649e41d5813d5a618caa3969be13b.rbi diff --git a/sorbet/rbi/gems/dry-configurable@0.13.0.rbi b/sorbet/rbi/gems/dry-configurable@0.15.0.rbi similarity index 100% rename from sorbet/rbi/gems/dry-configurable@0.13.0.rbi rename to sorbet/rbi/gems/dry-configurable@0.15.0.rbi diff --git a/sorbet/rbi/gems/dry-initializer@3.0.4.rbi b/sorbet/rbi/gems/dry-initializer@3.1.1.rbi similarity index 100% rename from sorbet/rbi/gems/dry-initializer@3.0.4.rbi rename to sorbet/rbi/gems/dry-initializer@3.1.1.rbi diff --git a/sorbet/rbi/gems/dry-schema@1.8.0.rbi b/sorbet/rbi/gems/dry-schema@1.9.2.rbi similarity index 100% rename from sorbet/rbi/gems/dry-schema@1.8.0.rbi rename to sorbet/rbi/gems/dry-schema@1.9.2.rbi diff --git a/sorbet/rbi/gems/dry-validation@1.7.0.rbi b/sorbet/rbi/gems/dry-validation@1.8.1.rbi similarity index 100% rename from sorbet/rbi/gems/dry-validation@1.7.0.rbi rename to sorbet/rbi/gems/dry-validation@1.8.1.rbi diff --git a/sorbet/rbi/gems/frozen_record@0.23.0.rbi b/sorbet/rbi/gems/frozen_record@0.23.0-4130a0600874aae2b8c83108053255d67f0cad08.rbi similarity index 100% rename from sorbet/rbi/gems/frozen_record@0.23.0.rbi rename to sorbet/rbi/gems/frozen_record@0.23.0-4130a0600874aae2b8c83108053255d67f0cad08.rbi