Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spike/further gem updates #459

Merged
merged 2 commits into from
Nov 14, 2024
Merged

Spike/further gem updates #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b607d2
Removed redundant version locks
bogdanadrianmarc Nov 13, 2024
ed085d3
Regenerated Gemfile.lock
bogdanadrianmarc Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier'

gem 'haml-rails'
gem 'webpacker', '~> 5.4', '>= 5.4.4'
gem 'webpacker', '~> 5.4'

# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
Expand All @@ -22,15 +22,15 @@ gem 'font-awesome-rails'
gem 'sass-rails'

gem 'govuk_elements_rails'
gem 'govuk_frontend_toolkit', '~> 7.0'
gem 'govuk_frontend_toolkit'
gem 'govuk_template'
gem 'js-routes'

gem 'faraday'
gem 'faraday_middleware'
gem 'get_process_mem', '~> 0.2.7'
gem 'get_process_mem'
gem 'http_accept_language'
gem 'prometheus-client', '~> 4.0'
gem 'prometheus-client'
gem 'puma'
gem 'puma-metrics'
gem 'rdf-turtle'
Expand Down Expand Up @@ -64,16 +64,16 @@ group :test do
# gem 'minitest-spec-rails'
gem 'mocha'
gem 'selenium-webdriver'
gem 'simplecov', '0.22.0', require: false
gem 'simplecov', require: false
gem 'vcr'
end

# TODO: For running the app locally for testing you can set this to your local path
# gem 'data_services_api', '~> 1.4.0', path: '~/Epimorphics/shared/data_services_api/'
# gem 'json_rails_logger', '~> 1.0.0', path: '~/Epimorphics/shared/json-rails-logger/'

# TODO: In production you want to set this to the gem from the epimorphics package repo
source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'data_services_api', '~> 1.4.0'
gem 'json_rails_logger', '~> 1.0.0'
gem 'data_services_api'
gem 'json_rails_logger'
end

# TODO: For running the app locally for testing you can set this to your local path
# gem 'data_services_api', path: '~/Epimorphics/shared/data_services_api'
# gem 'json_rails_logger', path: '~/Epimorphics/shared/json-rails-logger'
28 changes: 14 additions & 14 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,17 @@ GEM
ffi (1.17.0-x86_64-linux-musl)
font-awesome-rails (4.7.0.9)
railties (>= 3.2, < 9.0)
get_process_mem (0.2.7)
get_process_mem (1.0.0)
bigdecimal (>= 2.0)
ffi (~> 1.0)
globalid (1.2.1)
activesupport (>= 6.1)
govuk_elements_rails (3.1.3)
govuk_frontend_toolkit (>= 6.0.2)
rails (>= 4.1.0)
sass (>= 3.2.0)
govuk_frontend_toolkit (7.6.0)
govuk_frontend_toolkit (9.0.1)
railties (>= 3.1.0)
sass (>= 3.2.0)
govuk_template (0.26.0)
rails (>= 3.1)
haml (6.3.0)
Expand Down Expand Up @@ -335,7 +335,7 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.34.1)
rubocop-ast (1.35.0)
parser (>= 3.3.1.0)
rubocop-rails (2.27.0)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -381,7 +381,7 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
sorbet-runtime (0.5.11645)
sorbet-runtime (0.5.11647)
spring (4.2.1)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -432,7 +432,7 @@ GEM
GEM
remote: https://rubygems.pkg.github.com/epimorphics/
specs:
data_services_api (1.4.1.1)
data_services_api (1.5.1)
faraday_middleware (~> 1.2.0)
json (~> 2.6.1)
yajl-ruby (~> 1.4.1)
Expand Down Expand Up @@ -460,27 +460,27 @@ PLATFORMS
DEPENDENCIES
byebug
capybara_minitest_spec
data_services_api (~> 1.4.0)!
data_services_api!
faraday
faraday_middleware
font-awesome-rails
get_process_mem (~> 0.2.7)
get_process_mem
govuk_elements_rails
govuk_frontend_toolkit (~> 7.0)
govuk_frontend_toolkit
govuk_template
haml-lint
haml-rails
http_accept_language
js-routes
json_expressions
json_rails_logger (~> 1.0.0)!
json_rails_logger!
m
minitest-rails
minitest-reporters
mocha
nokogiri
oj
prometheus-client (~> 4.0)
prometheus-client
puma
puma-metrics
rails
Expand All @@ -490,13 +490,13 @@ DEPENDENCIES
sass-rails
selenium-webdriver
sentry-rails
simplecov (= 0.22.0)
simplecov
spring
tzinfo-data
uglifier (>= 1.3.0)
uglifier
vcr
web-console
webpacker (~> 5.4, >= 5.4.4)
webpacker (~> 5.4)
yajl-ruby

BUNDLED WITH
Expand Down