Skip to content

Commit 4d03ec1

Browse files
authored
Merge pull request #472 from alphagov/gihub-workflows
Ruby gem and package.json upgrades
2 parents b1c0837 + d08c0e1 commit 4d03ec1

5 files changed

Lines changed: 1323 additions & 1802 deletions

File tree

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
22

example/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.0
1+
3.2.6

govuk_tech_docs.gemspec

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,36 @@ Gem::Specification.new do |spec|
3333
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
3434
spec.require_paths = %w[lib]
3535

36-
spec.required_ruby_version = ">= 3.1.0"
36+
spec.required_ruby_version = ">= 3.2.6"
3737

38-
spec.add_dependency "autoprefixer-rails", "~> 10.2"
39-
spec.add_dependency "base64" # TODO: remove once middleman-sprockets declares this itself.
40-
spec.add_dependency "bigdecimal" # TODO: remove once activesupport declares this itself.
41-
spec.add_dependency "chronic", "~> 0.10.2"
42-
spec.add_dependency "concurrent-ruby", "1.3.4" # 1.3.5 introduced a change that breaks activesupport, and so middleman
38+
spec.add_dependency "autoprefixer-rails"
39+
spec.add_dependency "chronic"
40+
spec.add_dependency "concurrent-ruby"
4341
spec.add_dependency "csv" # TODO: remove once tilt declares this itself.
44-
spec.add_dependency "haml", "~> 6.0"
45-
spec.add_dependency "middleman", "~> 4.6.1"
46-
spec.add_dependency "middleman-autoprefixer", "~> 2.10"
47-
spec.add_dependency "middleman-compass", "~> 4.0"
42+
spec.add_dependency "haml", "~> 6.0" # middleman-core (4.6.3) depends on haml (>= 4.0.5, < 7)
43+
spec.add_dependency "middleman"
44+
spec.add_dependency "middleman-autoprefixer"
45+
spec.add_dependency "middleman-compass"
4846
spec.add_dependency "middleman-livereload"
4947
spec.add_dependency "middleman-search-gds"
50-
spec.add_dependency "middleman-sprockets", "~> 4.0.0"
51-
spec.add_dependency "middleman-syntax", "~> 3.6"
48+
=begin
49+
middleman-sprockets is very old and out of date. V4.1.0 has a breaking change. Will look to replace with gem "dartsass-sprockets" or uses sass in the package.json
50+
=end
51+
spec.add_dependency "middleman-sprockets", "4.0.0"
52+
spec.add_dependency "middleman-syntax"
5253
spec.add_dependency "mutex_m" # TODO: remove once activesupport declares this itself.
5354
spec.add_dependency "nokogiri"
54-
spec.add_dependency "openapi3_parser", "~> 0.10.1"
55-
spec.add_dependency "redcarpet", "~> 3.6"
56-
spec.add_dependency "sassc-embedded", "~> 1.78.0"
57-
58-
spec.add_development_dependency "benchmark"
55+
spec.add_dependency "openapi3_parser"
56+
spec.add_dependency "redcarpet"
57+
spec.add_dependency "sassc-embedded"
5958
spec.add_dependency "schmooze", "~> 0.2.0"
6059
spec.add_dependency "terser", "~> 1.2.3"
60+
61+
spec.add_development_dependency "benchmark"
6162
spec.add_development_dependency "byebug"
62-
spec.add_development_dependency "capybara", "~> 3.32"
63+
spec.add_development_dependency "capybara"
6364
spec.add_development_dependency "ostruct"
64-
spec.add_development_dependency "rake", "~> 13.0"
65-
spec.add_development_dependency "rspec", "~> 3.9"
66-
spec.add_development_dependency "rubocop-govuk", "~> 4.10"
65+
spec.add_development_dependency "rake"
66+
spec.add_development_dependency "rspec"
67+
spec.add_development_dependency "rubocop-govuk"
6768
end

0 commit comments

Comments
 (0)