Skip to content

Commit

Permalink
Merge pull request #1372 from DFE-Digital/various-dependency-update-a…
Browse files Browse the repository at this point in the history
…ug-22

Various dependency updates
  • Loading branch information
plisovin authored Aug 22, 2023
2 parents 827f059 + 6b3a631 commit 84e1574
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 118 deletions.
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem "pg"
# Use Puma as the app server
gem "puma", "~> 6.3"

gem "shakapacker", "6.6.0"
gem "shakapacker", "7.0.3"

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'
Expand All @@ -32,7 +32,7 @@ gem "foreman"
# Canonical meta tag
gem "canonical-rails"

gem "rack-cors"
gem "rack-cors", ">= 2.0.1"

gem "govuk_design_system_formbuilder"

Expand All @@ -43,7 +43,7 @@ gem "validates_timeliness", github: "mitsuru/validates_timeliness", branch: "rai

gem "dotenv-rails"

gem "dfe-analytics", github: "DFE-Digital/dfe-analytics", tag: "v1.8.1"
gem "dfe-analytics", github: "DFE-Digital/dfe-analytics", tag: "v1.10.1"

gem "rack-attack"

Expand Down Expand Up @@ -87,7 +87,7 @@ group :development, :test do
gem "rspec-sonarqube-formatter", "~> 1.5"
gem "simplecov", "~> 0.22.0"
# Adds support for Capybara system testing and selenium driver
gem "capybara", "~> 3.38"
gem "capybara", "~> 3.39.2"
# Factory builder
gem "factory_bot_rails"
end
Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/DFE-Digital/dfe-analytics.git
revision: 528b82c6f694d3c23b3b23882a20124a20e1c756
tag: v1.8.1
revision: 11d75a3c92cc15439c00ea7f2f8686acffefc103
tag: v1.10.1
specs:
dfe-analytics (1.8.1)
dfe-analytics (1.10.1)
google-cloud-bigquery (~> 1.38)
request_store_rails (~> 2)

Expand Down Expand Up @@ -122,7 +122,7 @@ GEM
byebug (11.1.3)
canonical-rails (0.2.14)
rails (>= 4.1, <= 7.1)
capybara (3.38.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
Expand Down Expand Up @@ -187,9 +187,9 @@ GEM
foreman (0.87.2)
globalid (1.0.1)
activesupport (>= 5.0)
google-apis-bigquery_v2 (0.51.0)
google-apis-bigquery_v2 (0.58.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
google-apis-core (0.11.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -198,7 +198,7 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-cloud-bigquery (1.42.0)
google-cloud-bigquery (1.43.1)
concurrent-ruby (~> 1.0)
google-apis-bigquery_v2 (~> 0.1)
google-cloud-core (~> 1.6)
Expand All @@ -210,7 +210,7 @@ GEM
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
googleauth (1.5.2)
googleauth (1.7.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -233,7 +233,7 @@ GEM
rails (>= 5.0)
iso_country_codes (0.7.8)
json (2.6.2)
jwt (2.7.0)
jwt (2.7.1)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -284,7 +284,7 @@ GEM
rack (2.2.7)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-cors (2.0.0)
rack-cors (2.0.1)
rack (>= 2.0.0)
rack-proxy (0.7.6)
rack
Expand Down Expand Up @@ -412,7 +412,7 @@ GEM
sentry-ruby (~> 5.9.0)
sentry-ruby (5.9.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
shakapacker (6.6.0)
shakapacker (7.0.3)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand Down Expand Up @@ -473,7 +473,7 @@ DEPENDENCIES
brakeman
byebug
canonical-rails
capybara (~> 3.38)
capybara (~> 3.39.2)
connection_pool
dfe-analytics!
dotenv-rails
Expand All @@ -493,7 +493,7 @@ DEPENDENCIES
pry-byebug
puma (~> 6.3)
rack-attack
rack-cors
rack-cors (>= 2.0.1)
rails (~> 7.0.3)
rails_semantic_logger (>= 4.10.0)
redis (~> 4.8.1)
Expand All @@ -505,7 +505,7 @@ DEPENDENCIES
selenium-webdriver
sentry-rails
sentry-ruby
shakapacker (= 6.6.0)
shakapacker (= 7.0.3)
shoulda-matchers
simplecov (~> 0.22.0)
spring
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
"turbolinks": "^5.2.0",
"webpack": "5",
"webpack-assets-manifest": "5",
"webpack-cli": "5",
"webpack-cli": "5.1.4",
"webpack-dev-server": "^4.11.1",
"webpack-merge": "5.9.0"
},
"devDependencies": {
"@stimulus/test": "^2.0.0",
"@webpack-cli/serve": "^2.0.2",
"@webpack-cli/serve": "^2.0.5",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.4.1"
"jest-environment-jsdom": "^29.6.2"
},
"jest": {
"testRegex": ".*_spec.js",
Expand Down
Loading

0 comments on commit 84e1574

Please sign in to comment.