From 88f248dbaad3191603449c91c204e74a9d8ba49b Mon Sep 17 00:00:00 2001
From: Matthias Kaeppler <mkaeppler@gitlab.com>
Date: Thu, 29 Jul 2021 12:34:43 +0200
Subject: [PATCH] Update js_regex and related dependencies
These are the minimum versions required to add
Ruby 3 support.
---
Gemfile | 4 ++--
Gemfile.lock | 34 ++++++++++++++++++++--------------
tooling/bin/parallel_rspec | 2 +-
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/Gemfile b/Gemfile
index d4126b7614fe6..d89e8f6adecf0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -223,7 +223,7 @@ gem 're2', '~> 1.2.0'
gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 3.4'
+gem 'js_regex', '~> 3.7'
# User agent parsing
gem 'device_detector'
@@ -523,7 +523,7 @@ gem 'valid_email', '~> 0.1'
# JSON
gem 'json', '~> 2.3.0'
-gem 'json_schemer', '~> 0.2.12'
+gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.10.6'
gem 'multi_json', '~> 1.14.1'
gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c78186595d58..02298bca3c85e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,7 +179,8 @@ GEM
mime-types (>= 1.16)
ssrf_filter (~> 1.0)
cbor (0.5.9.6)
- character_set (1.4.0)
+ character_set (1.4.1)
+ sorted_set (~> 1.0)
charlock_holmes (0.7.7)
chef-config (16.10.17)
addressable
@@ -307,8 +308,8 @@ GEM
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
e2mmap (0.1.0)
- ecma-re-validator (0.2.1)
- regexp_parser (~> 1.2)
+ ecma-re-validator (0.3.0)
+ regexp_parser (~> 2.0)
ed25519 (1.2.4)
elasticsearch (6.8.2)
elasticsearch-api (= 6.8.2)
@@ -604,7 +605,7 @@ GEM
temple (>= 0.8.2)
thor
tilt
- hana (1.3.6)
+ hana (1.3.7)
hangouts-chat (0.0.5)
hashdiff (1.0.1)
hashie (4.1.0)
@@ -652,19 +653,19 @@ GEM
multipart-post
oauth (~> 0.5, >= 0.5.0)
jmespath (1.4.0)
- js_regex (3.4.0)
+ js_regex (3.7.0)
character_set (~> 1.4)
- regexp_parser (~> 1.5)
- regexp_property_values (~> 0.3)
+ regexp_parser (~> 2.1)
+ regexp_property_values (~> 1.0)
json (2.3.0)
json-jwt (1.13.0)
activesupport (>= 4.2)
aes_key_wrap
bindata
- json_schemer (0.2.12)
- ecma-re-validator (~> 0.2)
+ json_schemer (0.2.18)
+ ecma-re-validator (~> 0.3)
hana (~> 1.3)
- regexp_parser (~> 1.5)
+ regexp_parser (~> 2.0)
uri_template (~> 0.7)
jsonpath (1.1.0)
multi_json
@@ -1010,6 +1011,7 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
+ rbtree (0.4.4)
rchardet (1.8.0)
rdoc (6.3.2)
re2 (1.2.0)
@@ -1035,8 +1037,8 @@ GEM
redis-store (>= 1.2, < 2)
redis-store (1.8.1)
redis (>= 4, < 5)
- regexp_parser (1.8.2)
- regexp_property_values (0.3.5)
+ regexp_parser (2.1.1)
+ regexp_property_values (1.0.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -1174,6 +1176,7 @@ GEM
rubyzip (>= 1.2.2)
sentry-raven (3.1.2)
faraday (>= 1.0)
+ set (1.0.1)
settingslogic (2.0.9)
sexp_processor (4.15.1)
shellany (0.0.1)
@@ -1218,6 +1221,9 @@ GEM
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
+ sorted_set (1.0.3)
+ rbtree
+ set (~> 1.0)
spamcheck (0.1.0)
grpc (~> 1.0)
spring (2.1.1)
@@ -1509,9 +1515,9 @@ DEPENDENCIES
invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3)
jira-ruby (~> 2.1.4)
- js_regex (~> 3.4)
+ js_regex (~> 3.7)
json (~> 2.3.0)
- json_schemer (~> 0.2.12)
+ json_schemer (~> 0.2.18)
jwt (~> 2.1.0)
kaminari (~> 1.0)
kas-grpc (~> 0.0.2)
diff --git a/tooling/bin/parallel_rspec b/tooling/bin/parallel_rspec
index a706df69a1ef1..06e5603a6b809 100755
--- a/tooling/bin/parallel_rspec
+++ b/tooling/bin/parallel_rspec
@@ -16,4 +16,4 @@ OptionParser.new do |opts|
end
end.parse!
-Tooling::ParallelRSpecRunner.run(options)
+Tooling::ParallelRSpecRunner.run(**options)
--
GitLab