From 94045f5d4cf012d9a04aae35b06eab3720969bc6 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 16 Jan 2025 11:22:34 +0000 Subject: [PATCH 1/2] Remove jasmine ruby gem and its requiring This was missed from the pull request that replaced the jasmine ruby gem with the jasmine-browser-runner: https://github.com/alphagov/tech-docs-gem/pull/382 --- Rakefile | 1 - govuk_tech_docs.gemspec | 1 - 2 files changed, 2 deletions(-) diff --git a/Rakefile b/Rakefile index 99404937..39e9782e 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,5 @@ require "bundler/gem_tasks" require "rspec/core/rake_task" -require "jasmine" RSpec::Core::RakeTask.new(:spec) diff --git a/govuk_tech_docs.gemspec b/govuk_tech_docs.gemspec index 4a1650d1..a60de91e 100644 --- a/govuk_tech_docs.gemspec +++ b/govuk_tech_docs.gemspec @@ -57,7 +57,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "byebug" spec.add_development_dependency "capybara", "~> 3.32" - spec.add_development_dependency "jasmine", "~> 3.5" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.9" spec.add_development_dependency "rubocop-govuk", "~> 4.10" From a7dc7dc409ec127a6a951f5c1d9c11833aa9a86a Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 17 Jan 2025 09:08:42 +0000 Subject: [PATCH 2/2] Lock concurrent-ruby to 1.3.4 1.3.5 introduced a change that broke activesupport (and so middleman, which uses it). It might be to do with it dropping Logger as a dependency but this is unclear. Full release notes are: https://github.com/ruby-concurrency/concurrent-ruby/releases/tag/v1.3.5 The activesupport gem fixed this in v7-0-stable of Rails: https://github.com/rails/rails/pull/54264 So we're waiting for middleman to pull that version in. They have an issue for this: https://github.com/middleman/middleman/issues/2788 --- govuk_tech_docs.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/govuk_tech_docs.gemspec b/govuk_tech_docs.gemspec index a60de91e..7c103a7d 100644 --- a/govuk_tech_docs.gemspec +++ b/govuk_tech_docs.gemspec @@ -39,6 +39,7 @@ Gem::Specification.new do |spec| spec.add_dependency "base64" # TODO: remove once middleman-sprockets declares this itself. spec.add_dependency "bigdecimal" # TODO: remove once activesupport declares this itself. spec.add_dependency "chronic", "~> 0.10.2" + spec.add_dependency "concurrent-ruby", "1.3.4" # 1.3.5 introduced a change that breaks activesupport, and so middleman spec.add_dependency "csv" # TODO: remove once tilt declares this itself. spec.add_dependency "haml", "~> 6.0" spec.add_dependency "middleman", "~> 4.0"