Skip to content

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@GUI
GUI committed Nov 9, 2023
1 parent 9f6193b commit c7289c0
Show file tree
Hide file tree
Showing 19 changed files with 1,229 additions and 1,150 deletions.
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"
ruby "~> 3.1"

# Task runner
gem "thor", "~> 1.2.1"
gem "thor", "~> 1.3.0"

# Tests
gem "minitest", "~> 5.20.0"
Expand All @@ -22,7 +22,7 @@ gem "minitest-ci", "~> 3.4.0"

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

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

# Database libraries
gem "activerecord", "~> 7.0.2", :require => "active_record"
gem "activerecord", "~> 7.1.1", :require => "active_record"
gem "pg", "~> 1.5.3"
gem "elasticsearch", "~> 7.13.3"
gem "active_attr", "~> 0.15.0"
gem "active_attr", "~> 0.16.0"

# Factories for test database data
gem "factory_bot", "~> 6.3.0"
Expand All @@ -61,7 +61,7 @@ gem "capybara-screenshot", "~> 1.0.22"
gem "nokogiri", "~> 1.14"

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

# Generating fake strings and data.
gem "faker", "~> 3.0"
Expand Down
102 changes: 58 additions & 44 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,49 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
rack (~> 2.0, >= 2.2.4)
actionpack (7.1.1)
actionview (= 7.1.1)
activesupport (= 7.1.1)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.8)
activesupport (= 7.0.8)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.1)
activesupport (= 7.1.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_attr (0.15.4)
actionpack (>= 3.0.2, < 7.1)
activemodel (>= 3.0.2, < 7.1)
activesupport (>= 3.0.2, < 7.1)
activemodel (7.0.8)
activesupport (= 7.0.8)
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activesupport (7.0.8)
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.1)
activesupport (= 7.1.1)
activerecord (7.1.1)
activemodel (= 7.1.1)
activesupport (= 7.1.1)
timeout (>= 0.4.0)
activesupport (7.1.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ansi (1.5.0)
ast (2.4.2)
awesome_print (1.9.2)
base64 (0.1.1)
base64 (0.2.0)
bcrypt (3.1.19)
bigdecimal (3.1.4)
builder (3.2.4)
capybara (3.39.2)
addressable
Expand All @@ -54,7 +63,10 @@ GEM
childprocess (3.0.0)
colorize (1.1.0)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
crass (1.0.6)
drb (2.2.0)
ruby2_keywords
elasticsearch (7.13.3)
elasticsearch-api (= 7.13.3)
elasticsearch-transport (= 7.13.3)
Expand All @@ -69,7 +81,7 @@ GEM
ffi (>= 1.15.0)
factory_bot (6.3.0)
activesupport (>= 5.0.0)
faker (3.2.1)
faker (3.2.2)
i18n (>= 1.8.11, < 2)
faraday (1.10.3)
faraday-em_http (~> 1.0)
Expand All @@ -94,20 +106,20 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.16.2)
ffi (1.16.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
json (2.6.3)
language_server-protocol (3.17.0.3)
launchy (2.5.2)
addressable (~> 2.8)
loofah (2.21.3)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
matrix (0.4.2)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
mini_portile2 (2.8.5)
minitest (5.20.0)
minitest-ci (3.4.0)
minitest (>= 5.0.6)
Expand All @@ -122,7 +134,8 @@ GEM
path_expander (~> 1.1)
multi_json (1.15.0)
multipart-post (2.3.0)
net-protocol (0.2.1)
mutex_m (0.2.0)
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-protocol
Expand All @@ -135,14 +148,16 @@ GEM
racc (~> 1.4)
oj (3.16.1)
parallel (1.23.0)
parser (3.2.2.3)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
path_expander (1.1.1)
pg (1.5.4)
public_suffix (5.0.3)
racc (1.7.1)
rack (2.2.8)
racc (1.7.3)
rack (3.0.8)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rails-dom-testing (2.2.0)
Expand All @@ -154,37 +169,36 @@ GEM
nokogiri (~> 1.14)
rails_compatible_cookies_utils (0.1.2)
rainbow (3.1.1)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rubocop (1.56.3)
base64 (~> 0.1.1)
rubocop (1.57.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-minitest (0.31.1)
rubocop-minitest (0.33.0)
rubocop (>= 1.39, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
thor (1.2.2)
timeout (0.4.0)
thor (1.3.0)
timeout (0.4.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
xpath (3.2.0)
nokogiri (~> 1.8)
zonebie (0.6.1)
Expand All @@ -195,9 +209,9 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
active_attr (~> 0.15.0)
activerecord (~> 7.0.2)
activesupport (~> 7.0.4)
active_attr (~> 0.16.0)
activerecord (~> 7.1.1)
activesupport (~> 7.1.1)
addressable (~> 2.8.0)
awesome_print (~> 1.9.2)
bcrypt (~> 3.1.12)
Expand All @@ -224,9 +238,9 @@ DEPENDENCIES
rails_compatible_cookies_utils (~> 0.1.0)
rainbow (~> 3.1.1)
rubocop (~> 1.4)
rubocop-minitest (~> 0.31.0)
rubocop-minitest (~> 0.33.0)
selenium-webdriver (~> 3.141)
thor (~> 1.2.1)
thor (~> 1.3.0)
typhoeus (~> 1.4.0)
zonebie (~> 0.6.1)

Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
View file
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.30.1
task_version:=3.31.0
$(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
19 changes: 8 additions & 11 deletions build/patches/lrexlib-pcre2.patch
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
diff --git a/lrexlib-pcre2-2.9.1-1.rockspec b/lrexlib-pcre2-2.9.1-1.rockspec
diff --git a/lrexlib-pcre2-2.9.2-1.rockspec b/lrexlib-pcre2-2.9.2-1.rockspec
index ea788041..9ca5fbf9 100644
--- a/lrexlib-pcre2-2.9.1-1.rockspec
+++ b/lrexlib-pcre2-2.9.1-1.rockspec
@@ -13,12 +13,14 @@ build = {
},
libraries = {
"pcre2-8",
+ "luajit-5.1",
},
incdirs = {
"$(PCRE2_INCDIR)",
--- a/lrexlib-pcre2-2.9.2-1.rockspec
+++ b/lrexlib-pcre2-2.9.2-1.rockspec
@@ -32,9 +32,11 @@ build = {
},
libdirs = {
"$(PCRE2_LIBDIR)",
+ "$(STAGE_EMBEDDED_LIBDIR)",
},
libraries = {
"pcre2-8",
+ "luajit-5.1",
},
},
},
4 changes: 2 additions & 2 deletions src/api-umbrella-git-1.rockspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies = {
"bcrypt ~> 2.3",
"dkjson ~> 2.6",
"inspect ~> 3.1.3",
"lapis ~> 1.14.0",
"lapis ~> 1.16.0",
"libcidr-ffi ~> 1.0.0",
"lua-resty-http ~> 0.17.1",
"lua-resty-mail ~> 1.1.0",
Expand All @@ -22,7 +22,7 @@ dependencies = {
"lua-resty-uuid ~> 1.1",
"lua-resty-validation ~> 2.7",
"luajit-zstd ~> 0.2.3",
"lualdap ~> 1.3.1",
"lualdap ~> 1.4.0",
"luaposix ~> 36.2.1",
"luautf8 ~> 0.1.5",
"lustache ~> 1.3.1",
Expand Down
Loading

0 comments on commit c7289c0

Please sign in to comment.