From 406069bef0c00217c5450efe624e493e4f6effd3 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Thu, 7 Nov 2024 12:07:49 -0500 Subject: [PATCH] WIP: try to fix ci for ruby under 3.2 --- lib/generators/trln_argon/install_generator.rb | 9 +++++---- trln_argon.gemspec | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/generators/trln_argon/install_generator.rb b/lib/generators/trln_argon/install_generator.rb index 80d65ed7..d5265eda 100644 --- a/lib/generators/trln_argon/install_generator.rb +++ b/lib/generators/trln_argon/install_generator.rb @@ -69,13 +69,14 @@ def update_assets_manifest say_status('info', '============================', :magenta) say_status('info', 'Updating the assets manifest', :magenta) say_status('info', '============================', :magenta) - + prepend_to_file 'app/assets/config/manifest.js', "//= link trln_argon_manifest.js\n" prepend_to_file 'app/assets/config/manifest.js', "//= link blacklight/manifest.js\n" - - return unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1') + + # return unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1') + return if IO.read('app/assets/javascripts/application.js').include?('trln_argon') append_to_file 'app/assets/config/manifest.js', "//= link application.js\n" - end + end def install_stylesheet copy_file 'trln_argon.scss', 'app/assets/stylesheets/trln_argon.scss' diff --git a/trln_argon.gemspec b/trln_argon.gemspec index e9688055..84120720 100644 --- a/trln_argon.gemspec +++ b/trln_argon.gemspec @@ -58,6 +58,7 @@ Gem::Specification.new do |s| s.add_dependency 'dartsass-sprockets', '< 3.1.0' s.add_dependency 'sass-embedded', '<= 1.69.5' + s.add_dependency 'uri', '< 1.0' s.add_dependency 'dartsass-ruby', '>= 3.0.2' # Ruby 3.1 @@ -65,6 +66,7 @@ Gem::Specification.new do |s| elsif Gem::Requirement.new('< 3.2').satisfied_by?(Gem::Version.new(RUBY_VERSION)) s.add_dependency 'dartsass-sprockets' s.add_dependency 'sass-embedded', '<= 1.70' + s.add_dependency 'uri', '< 1.0' # Ruby 3.2+ # =================