Skip to content

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
GUI committed Nov 1, 2024
1 parent e80ac9c commit ca55242
Show file tree
Hide file tree
Showing 24 changed files with 2,254 additions and 2,248 deletions.
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ruby "~> 3.1"
gem "thor", "~> 1.3.0"

# Tests
gem "minitest", "~> 5.24.1"
gem "minitest", "~> 5.25.1"

# CLI helper for running tests
gem "minitest-sprint", "~> 1.2.0"
gem "minitest-sprint", "~> 1.3.0"

# More test outputs
gem "minitest-reporters", "~> 1.7.1"
Expand All @@ -25,7 +25,7 @@ gem "minitest-ci", "~> 3.4.0"

# Ruby lint/style checker
gem "rubocop", "~> 1.4", :require => false
gem "rubocop-minitest", "~> 0.35.0", :require => false
gem "rubocop-minitest", "~> 0.36.0", :require => false

# Running background processes
gem "childprocess"
Expand All @@ -38,14 +38,14 @@ gem "multi_json", "~> 1.15.0"
gem "oj", "~> 3.10"

# Database libraries
gem "activerecord", "~> 7.1.1", :require => "active_record"
gem "activerecord", "~> 7.2.2", :require => "active_record"
gem "pg", "~> 1.5.3"
gem "opensearch-ruby", "~> 3.4.0"
gem "faraday-typhoeus", "~> 1.1.0"
gem "active_attr", "~> 0.16.0"
gem "active_attr", "~> 0.17.0"

# Factories for test database data
gem "factory_bot", "~> 6.4.0"
gem "factory_bot", "~> 6.5.0"

# Programmatically generate Rails session cookies.
gem "rails_compatible_cookies_utils", "~> 0.1.0"
Expand All @@ -67,7 +67,7 @@ gem "capybara-shadowdom", "~> 0.3.0"
gem "nokogiri", "~> 1.14"

# Useful additions
gem "activesupport", "~> 7.1.1"
gem "activesupport", "~> 7.2.2"

# Generating fake strings and data.
gem "faker", "~> 3.0"
Expand Down
136 changes: 71 additions & 65 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,49 +1,53 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
useragent (~> 0.16)
actionview (7.2.2)
activesupport (= 7.2.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_attr (0.16.0)
actionpack (>= 3.0.2, < 7.2)
activemodel (>= 3.0.2, < 7.2)
activesupport (>= 3.0.2, < 7.2)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
active_attr (0.17.0)
actionpack (>= 3.0.2, < 8.0)
activemodel (>= 3.0.2, < 8.0)
activesupport (>= 3.0.2, < 8.0)
activemodel (7.2.2)
activesupport (= 7.2.2)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
timeout (>= 0.4.0)
activesupport (7.1.3.4)
activesupport (7.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ansi (1.5.0)
ast (2.4.2)
awesome_print (1.9.2)
base64 (0.2.0)
bcrypt (3.1.20)
benchmark (0.3.0)
bigdecimal (3.1.8)
builder (3.3.0)
capybara (3.40.0)
Expand All @@ -60,86 +64,89 @@ GEM
launchy
capybara-shadowdom (0.3.0)
capybara
childprocess (5.0.0)
concurrent-ruby (1.3.3)
childprocess (5.1.0)
logger (~> 1.5)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crass (1.0.6)
drb (2.2.1)
encryptor (3.0.0)
erubi (1.13.0)
ethon (0.16.0)
ffi (>= 1.15.0)
factory_bot (6.4.6)
factory_bot (6.5.0)
activesupport (>= 5.0.0)
faker (3.4.2)
faker (3.5.1)
i18n (>= 1.8.11, < 2)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
faraday (2.12.0)
faraday-net_http (>= 2.0, < 3.4)
json
logger
faraday-net_http (3.1.0)
faraday-net_http (3.3.0)
net-http
faraday-typhoeus (1.1.0)
faraday (~> 2.0)
typhoeus (~> 1.4)
ffi (1.17.0)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
json (2.7.2)
json (2.7.5)
language_server-protocol (3.17.0.3)
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (1.6.0)
loofah (2.22.0)
logger (1.6.1)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
matrix (0.4.2)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.24.1)
minitest (5.25.1)
minitest-ci (3.4.0)
minitest (>= 5.0.6)
minitest-hooks (1.5.1)
minitest-hooks (1.5.2)
minitest (> 5.3)
minitest-reporters (1.7.1)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-retry (0.2.2)
minitest-retry (0.2.3)
minitest (>= 5.0)
minitest-sprint (1.2.2)
minitest-sprint (1.3.0)
path_expander (~> 1.1)
multi_json (1.15.0)
mutex_m (0.2.0)
net-http (0.4.1)
uri
net-protocol (0.2.2)
timeout
net-smtp (0.5.0)
net-protocol
nokogiri (1.16.6)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.6-aarch64-linux)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
oj (3.16.4)
oj (3.16.6)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
opensearch-ruby (3.4.0)
faraday (>= 1.0, < 3)
multi_json (>= 1.0)
parallel (1.25.1)
parser (3.3.4.0)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.5.1)
ast (~> 2.4.1)
racc
path_expander (1.1.2)
pg (1.5.6)
public_suffix (6.0.0)
racc (1.8.0)
rack (3.1.7)
path_expander (1.1.3)
pg (1.5.9)
public_suffix (6.0.1)
racc (1.8.1)
rack (3.1.8)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
Expand All @@ -154,41 +161,40 @@ GEM
rails_compatible_cookies_utils (0.1.2)
rainbow (3.1.1)
regexp_parser (2.9.2)
rexml (3.3.2)
strscan
rubocop (1.65.0)
rexml (3.3.9)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.33.0)
parser (>= 3.3.1.0)
rubocop-minitest (0.35.1)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
selenium-webdriver (4.22.0)
securerandom (0.3.1)
selenium-webdriver (4.26.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
strscan (3.1.0)
thor (1.3.1)
thor (1.3.2)
timeout (0.4.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
unicode-display_width (2.6.0)
uri (0.13.1)
useragent (0.16.10)
websocket (1.2.11)
xpath (3.2.0)
nokogiri (~> 1.8)
Expand All @@ -200,9 +206,9 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
active_attr (~> 0.16.0)
activerecord (~> 7.1.1)
activesupport (~> 7.1.1)
active_attr (~> 0.17.0)
activerecord (~> 7.2.2)
activesupport (~> 7.2.2)
addressable (~> 2.8.0)
awesome_print (~> 1.9.2)
bcrypt (~> 3.1.12)
Expand All @@ -212,16 +218,16 @@ DEPENDENCIES
childprocess
concurrent-ruby (~> 1.3.3)
encryptor (~> 3.0.0)
factory_bot (~> 6.4.0)
factory_bot (~> 6.5.0)
faker (~> 3.0)
faraday-typhoeus (~> 1.1.0)
ice_nine (~> 0.11.2)
minitest (~> 5.24.1)
minitest (~> 5.25.1)
minitest-ci (~> 3.4.0)
minitest-hooks (~> 1.5.0)
minitest-reporters (~> 1.7.1)
minitest-retry (~> 0.2.2)
minitest-sprint (~> 1.2.0)
minitest-sprint (~> 1.3.0)
multi_json (~> 1.15.0)
net-smtp (~> 0.5.0)
nokogiri (~> 1.14)
Expand All @@ -231,7 +237,7 @@ DEPENDENCIES
rails_compatible_cookies_utils (~> 0.1.0)
rainbow (~> 3.1.1)
rubocop (~> 1.4)
rubocop-minitest (~> 0.35.0)
rubocop-minitest (~> 0.36.0)
selenium-webdriver (~> 4.15)
thor (~> 1.3.0)
typhoeus (~> 1.4.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export PREFIX=$(prefix)
default: all

# Download and locally install the "task" tool.
task_version:=3.38.0
task_version:=3.39.2
$(source_dir)/tasks/bootstrap-$(task_version): ;
$(work_dir)/stamp/bootstrap-$(task_version): $(source_dir)/tasks/bootstrap-$(task_version)
$(source_dir)/tasks/bootstrap-$(task_version)
Expand Down
4 changes: 2 additions & 2 deletions build/patches/openresty-cli.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ diff --git a/configure b/configure
index 0a4f09b..e7d0d0c 100755
--- a/configure
+++ b/configure
@@ -1096,38 +1096,6 @@ _EOC_
@@ -1164,38 +1164,6 @@ _EOC_
}
push @make_install_cmds, "cd $root_dir/build/$resty_cli_dir && "
. "$root_dir/build/install bin/* $target_dir";
. "\$(INSTALL) bin/* $target_dir";
-
- if ($platform ne 'msys') {
- # patch the resty script:
Expand Down
4 changes: 2 additions & 2 deletions src/api-umbrella-git-1.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies = {
"lua-resty-mail ~> 1.1.0",
"lua-resty-mlcache ~> 2.7.0",
"lua-resty-nettle ~> 2.1",
"lua-resty-openidc ~> 1.7.6",
"lua-resty-session ~> 3.10",
"lua-resty-openidc ~> 1.8.0",
"lua-resty-session ~> 4.0.5",
"lua-resty-txid ~> 1.0.0",
"lua-resty-uuid ~> 1.1",
"lua-resty-validation ~> 2.7",
Expand Down
Loading

0 comments on commit ca55242

Please sign in to comment.