Bump tailwind merge

aviflombaum · Jul 22, 2024 · 90dbe4a · 90dbe4a
1 parent d2df572
commit 90dbe4a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -82,5 +82,5 @@ gem "redcarpet", "~> 3.6"
 
 gem "rouge", "~> 4.1"
 
-gem "tailwind_merge", "~> 0.7.4"
+gem "tailwind_merge", "~> 0.12"
 gem "meta-tags"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    shadcn-ui (0.0.13)
-      tailwind_merge (~> 0.7)
+    shadcn-ui (0.0.14)
+      tailwind_merge (~> 0.12)
 
 GEM
   remote: https://rubygems.org/
@@ -252,7 +252,7 @@ GEM
     sqlite3 (1.6.3-x86_64-linux)
     stimulus-rails (1.2.1)
       railties (>= 6.0.0)
-    tailwind_merge (0.7.4)
+    tailwind_merge (0.12.0)
       lru_redux (~> 1.1)
     tailwindcss-rails (2.0.29-arm64-darwin)
       railties (>= 6.0.0)
@@ -306,7 +306,7 @@ DEPENDENCIES
   sprockets-rails
   sqlite3 (~> 1.4)
   stimulus-rails
-  tailwind_merge (~> 0.7.4)
+  tailwind_merge (~> 0.12)
   tailwindcss-rails
   turbo-rails
   tzinfo-data

diff --git a/lib/shadcn-ui/version.rb b/lib/shadcn-ui/version.rb
@@ -1,3 +1,3 @@
 module ShadcnUi
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end
diff --git a/shadcn-ui.gemspec b/shadcn-ui.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "tailwind_merge", "~> 0.7"
+  spec.add_dependency "tailwind_merge", "~> 0.12"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html