Skip to content

Commit

Permalink
Various dependency updates for ruby
Browse files Browse the repository at this point in the history
  • Loading branch information
@plisovin
plisovin committed Jul 14, 2023
1 parent b516f6a commit 1b63064
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 51 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,15 @@ RUN yarn install && yarn cache clean
# Install Gems removing artifacts
COPY .ruby-version Gemfile Gemfile.lock ./
# hadolint ignore=SC2046
RUN gem install bundler --version='~> 2.3.4' && \
RUN gem install bundler --version='~> 2.3.6' && \
bundle lock --add-platform x86-mingw32 x86-mswin32 x64-mingw32 java && \
bundle install --jobs=$(nproc --all) && \
rm -rf /root/.bundle/cache && \
rm -rf /usr/local/bundle/cache

# Add code and compile assets
COPY . .
RUN gem install nokogiri:1.13.3 && \
bundle exec rake assets:precompile SECRET_KEY_BASE=stubbed SKIP_REDIS=true
RUN bundle exec rake assets:precompile SECRET_KEY_BASE=stubbed SKIP_REDIS=true

# Create symlinks for CSS files without digest hashes for use in error pages
RUN bundle exec rake assets:symlink_non_digested SECRET_KEY_BASE=stubbed SKIP_REDIS=true
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ gem 'activerecord-import'
# See https://github.com/adzap/validates_timeliness/pull/213
gem "validates_timeliness", github: "mitsuru/validates_timeliness", ref: "f28a625"

gem "get_into_teaching_api_client_faraday", github: "DFE-Digital/get-into-teaching-api-ruby-client", require: "api/client"
gem "get_into_teaching_api_client_faraday", github: "DFE-Digital/get-into-teaching-api-ruby-client", ref: "6619b0f", require: "api/client"

# See https://github.com/mikel/mail/pull/1439
gem 'net-smtp', require: false
Expand Down Expand Up @@ -115,7 +115,7 @@ group :development, :test do

# Testing framework
gem 'factory_bot_rails', '>= 6.2.0'
gem 'rspec_junit_formatter'
gem 'rspec_junit_formatter', '>= 0.6.0'
gem 'rspec-rails', '~> 6.0.1'
gem 'rspec-sonarqube-formatter'

Expand Down
87 changes: 41 additions & 46 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ GIT

GIT
remote: https://github.com/DFE-Digital/get-into-teaching-api-ruby-client.git
revision: a7a90dcad3504755cde124a7e180cdc9e6211c2d
revision: 6619b0f9e00db68618deb05ef493930d2dff3b5d
ref: 6619b0f
specs:
get_into_teaching_api_client (3.2.0)
get_into_teaching_api_client (3.3.0)
faraday (~> 1.0, >= 1.0.1)
get_into_teaching_api_client_faraday (3.2.0)
get_into_teaching_api_client_faraday (3.3.0)
activesupport
faraday
faraday-encoding
Expand Down Expand Up @@ -158,44 +159,38 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
cucumber (7.1.0)
cucumber (8.0.0)
builder (~> 3.2, >= 3.2.4)
cucumber-core (~> 10.1, >= 10.1.0)
cucumber-create-meta (~> 6.0, >= 6.0.1)
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
cucumber-gherkin (~> 22.0, >= 22.0.0)
cucumber-html-formatter (~> 17.0, >= 17.0.0)
cucumber-messages (~> 17.1, >= 17.1.1)
cucumber-wire (~> 6.2, >= 6.2.0)
diff-lcs (~> 1.4, >= 1.4.4)
mime-types (~> 3.3, >= 3.3.1)
multi_test (~> 0.1, >= 0.1.2)
cucumber-ci-environment (~> 9.0, >= 9.0.4)
cucumber-core (~> 11.0, >= 11.0.0)
cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
cucumber-gherkin (~> 23.0, >= 23.0.1)
cucumber-html-formatter (~> 19.1, >= 19.1.0)
cucumber-messages (~> 18.0, >= 18.0.0)
diff-lcs (~> 1.5, >= 1.5.0)
mime-types (~> 3.4, >= 3.4.1)
multi_test (~> 1.1, >= 1.1.0)
sys-uname (~> 1.2, >= 1.2.2)
cucumber-core (10.1.1)
cucumber-gherkin (~> 22.0, >= 22.0.0)
cucumber-messages (~> 17.1, >= 17.1.1)
cucumber-ci-environment (9.2.0)
cucumber-core (11.0.0)
cucumber-gherkin (~> 23.0, >= 23.0.1)
cucumber-messages (~> 18.0, >= 18.0.0)
cucumber-tag-expressions (~> 4.1, >= 4.1.0)
cucumber-create-meta (6.0.4)
cucumber-messages (~> 17.1, >= 17.1.1)
sys-uname (~> 1.2, >= 1.2.2)
cucumber-cucumber-expressions (14.0.0)
cucumber-gherkin (22.0.0)
cucumber-messages (~> 17.1, >= 17.1.1)
cucumber-html-formatter (17.0.0)
cucumber-messages (~> 17.1, >= 17.1.0)
cucumber-messages (17.1.1)
cucumber-rails (2.5.1)
cucumber-cucumber-expressions (15.2.0)
cucumber-gherkin (23.0.1)
cucumber-messages (~> 18.0, >= 18.0.0)
cucumber-html-formatter (19.2.0)
cucumber-messages (~> 18.0, >= 18.0.0)
cucumber-messages (18.0.0)
cucumber-rails (2.6.1)
capybara (>= 2.18, < 4)
cucumber (>= 3.2, < 8)
cucumber (>= 3.2, < 9)
mime-types (~> 3.3)
nokogiri (~> 1.10)
railties (>= 5.0, < 8)
rexml (~> 3.0)
webrick (~> 1.7)
cucumber-tag-expressions (4.1.0)
cucumber-wire (6.2.1)
cucumber-core (~> 10.1, >= 10.1.0)
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
daemons (1.4.1)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
Expand Down Expand Up @@ -237,7 +232,7 @@ GEM
faraday-encoding (0.0.5)
faraday
faraday-excon (1.1.0)
faraday-http-cache (2.4.1)
faraday-http-cache (2.5.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
Expand Down Expand Up @@ -290,14 +285,14 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
govuk_design_system_formbuilder (4.0.0)
govuk_design_system_formbuilder (3.3.0)
actionview (>= 6.1)
activemodel (>= 6.1)
activesupport (>= 6.1)
html-attributes-utils (~> 1)
html-attributes-utils (~> 0.9, >= 0.9.2)
hashdiff (1.0.1)
hashids (1.0.6)
html-attributes-utils (1.0.0)
html-attributes-utils (0.9.2)
activesupport (>= 6.1.4.4)
htmlentities (4.3.4)
httpclient (2.8.3)
Expand Down Expand Up @@ -346,12 +341,12 @@ GEM
method_source (1.0.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
minitest (5.18.0)
msgpack (1.7.1)
multi_json (1.15.0)
multi_test (0.1.2)
multi_test (1.1.0)
multipart-post (2.3.0)
net-imap (0.3.4)
date
Expand Down Expand Up @@ -504,7 +499,7 @@ GEM
htmlentities (~> 4.3.3)
rspec (~> 3.0)
rspec-support (3.11.0)
rspec_junit_formatter (0.5.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.31.2)
json (~> 2.3)
Expand Down Expand Up @@ -591,7 +586,7 @@ GEM
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
sys-uname (1.2.2)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.2)
timeliness (0.4.4)
Expand Down Expand Up @@ -673,17 +668,17 @@ DEPENDENCIES
capybara (>= 3.38.0)
capybara-screenshot
connection_pool
cucumber-rails (= 2.5.1)
cucumber-rails (>= 2.4.0)
daemons
database_cleaner (= 2.0.2)
database_cleaner
dfe-analytics!
dotenv-rails (>= 2.7.6)
factory_bot_rails (>= 6.2.0)
faraday
foreman
geocoder
get_into_teaching_api_client_faraday!
govuk_design_system_formbuilder (= 4.0.0)
govuk_design_system_formbuilder (~> 3.1)
hashids
ice_cube
invisible_captcha (>= 2.0.0)
Expand All @@ -697,7 +692,7 @@ DEPENDENCIES
parallel_tests
pg (>= 0.18, < 2.0)
pg_search
phonelib (= 0.8.2)
phonelib
pry-byebug
pry-rails
puma (~> 6.0)
Expand All @@ -713,9 +708,9 @@ DEPENDENCIES
rspec-json_expectations (~> 2.2)
rspec-rails (~> 6.0.1)
rspec-sonarqube-formatter
rspec_junit_formatter
rspec_junit_formatter (>= 0.6.0)
rubocop-govuk
selenium-webdriver (= 4.10.0)
selenium-webdriver
sentry-rails
sentry-ruby
sentry-sidekiq
Expand All @@ -739,7 +734,7 @@ DEPENDENCIES
yabeda-sidekiq

RUBY VERSION
ruby 3.1.3p185
ruby 3.1.0p0

BUNDLED WITH
2.3.10
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"stimulus": "^3.2.1",
"style-loader": "^3.3.2",
"terser-webpack-plugin": "^5.3.9",
"vscode-languageclient": "^8.1.0",
"webpack": "^5.69.1",
"webpack-assets-manifest": "^5.1.0",
"webpack-cli": "^5.1.4",
Expand Down
48 changes: 48 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2857,6 +2857,13 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"

brace-expansion@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
dependencies:
balanced-match "^1.0.0"

braces@^3.0.1, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
Expand Down Expand Up @@ -5094,6 +5101,13 @@ minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"

minimatch@^5.1.0:
version "5.1.6"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
dependencies:
brace-expansion "^2.0.1"

minimist@^1.2.5:
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
Expand Down Expand Up @@ -6426,6 +6440,13 @@ semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"

semver@^7.3.7:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"

semver@^7.3.8:
version "7.3.8"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
Expand Down Expand Up @@ -6981,6 +7002,33 @@ vary@~1.1.2:
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=

[email protected]:
version "8.1.0"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94"
integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==

vscode-languageclient@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz#3e67d5d841481ac66ddbdaa55b4118742f6a9f3f"
integrity sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==
dependencies:
minimatch "^5.1.0"
semver "^7.3.7"
vscode-languageserver-protocol "3.17.3"

[email protected]:
version "3.17.3"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57"
integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==
dependencies:
vscode-jsonrpc "8.1.0"
vscode-languageserver-types "3.17.3"

[email protected]:
version "3.17.3"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64"
integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==

walker@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
Expand Down

0 comments on commit 1b63064

Please sign in to comment.