From 1ff66bc0b4e2144f1b08bfaf9e6de86f7f69678a Mon Sep 17 00:00:00 2001 From: Derek Kniffin Date: Fri, 10 Jan 2025 10:03:58 -0500 Subject: [PATCH 1/3] Updates to resolve dartsass deprecation warnings --- app/assets/stylesheets/activeadmin_reorderable.scss | 5 ++++- package.json | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/activeadmin_reorderable.scss b/app/assets/stylesheets/activeadmin_reorderable.scss index 36319c7..f19ceda 100644 --- a/app/assets/stylesheets/activeadmin_reorderable.scss +++ b/app/assets/stylesheets/activeadmin_reorderable.scss @@ -1,7 +1,10 @@ +@use "@activeadmin/activeadmin/src/scss/mixins/all" as *; + .aa-reorderable { .reorder-handle { - @include light-button; cursor: move; + + @include light-button; } .dragged-row { diff --git a/package.json b/package.json index 7c50ad7..b59693b 100644 --- a/package.json +++ b/package.json @@ -11,5 +11,7 @@ "license": "MIT", "scripts": { }, "devDependencies": { }, - "dependencies": { } + "dependencies": { + "@activeadmin/activeadmin": "^3.2.0" + } } From ae358c8dd3942c37b721d327d47bb6dfdf0f1273 Mon Sep 17 00:00:00 2001 From: Derek Kniffin Date: Mon, 3 Feb 2025 15:38:04 -0500 Subject: [PATCH 2/3] Update the setup-ruby version that runs in the github action --- .github/workflows/rubyonrails.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index e125f0e..ba8f9aa 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 # Add or replace dependency steps here - name: Install Ruby and gems - uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0 + uses: ruby/setup-ruby@v1 with: bundler-cache: true # Add or replace database setup steps here From 245fdabc0099fd1ece80ebf4bb7bbe1e2fcd3a2e Mon Sep 17 00:00:00 2001 From: Derek Kniffin Date: Mon, 3 Feb 2025 15:46:27 -0500 Subject: [PATCH 3/3] Add concurrent-ruby This is aimed at fixing --- activeadmin_reorderable.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/activeadmin_reorderable.gemspec b/activeadmin_reorderable.gemspec index 5c1e59e..a0957b9 100644 --- a/activeadmin_reorderable.gemspec +++ b/activeadmin_reorderable.gemspec @@ -26,4 +26,5 @@ Gem::Specification.new do |s| s.add_development_dependency "selenium-webdriver", '~> 4.10' s.add_development_dependency "sqlite3", "~> 1.4" s.add_development_dependency "sassc-rails" + s.add_development_dependency "concurrent-ruby", "1.3.4" end