From 5e172915b4c86eb59c36c7ebd9755f156b7ff47d Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Thu, 6 Feb 2025 10:09:33 +0000
Subject: [PATCH] Restrict treetop gem dependency

Fix concurrent-ruby version to 1.3.4 for older Rails versions
---
 CHANGELOG.md             | 3 ++-
 canql.gemspec            | 4 +++-
 gemfiles/Gemfile.rails70 | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 449bfd4..88950f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [Unreleased]
-* no unreleased changes *
+### Fixed
+* Restrict treetop gem dependency
 
 ## 6.0.2 / 2024-11-18
 ### Fixed
diff --git a/canql.gemspec b/canql.gemspec
index 8f7bafd..e171ad0 100644
--- a/canql.gemspec
+++ b/canql.gemspec
@@ -28,7 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'chronic', '~> 0.3'
   spec.add_dependency 'ndr_support', '>= 3.0', '< 6'
   spec.add_dependency 'rails', '>= 7.0', '< 8.1'
-  spec.add_dependency 'treetop', '>= 1.4.10'
+  # treetop 1.6.14 causes errors. I think this may be a buggy release and fixed soon,
+  # but I'll restrict the version we use for now.
+  spec.add_dependency 'treetop', '~> 1.6.12', '< 1.6.14'
 
   # spec.add_development_dependency 'bundler'
   # spec.add_development_dependency 'guard'
diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70
index b009be6..a25d01a 100644
--- a/gemfiles/Gemfile.rails70
+++ b/gemfiles/Gemfile.rails70
@@ -14,3 +14,6 @@ gem 'github-linguist'
 gem 'pry'
 gem 'rake'
 gem 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/
+
+# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260
+gem 'concurrent-ruby', '1.3.4'