Merge pull request #211 from azuchi/support-rails-8.0

Support rails 8.0
chaintope · Feb 4, 2025 · 38988e0 · 38988e0
2 parents 64c9f6e + bcea7a2
commit 38988e0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/glueby.gemspec b/glueby.gemspec
@@ -26,12 +26,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'tapyrus', '>= 0.3.1'
-  spec.add_runtime_dependency 'activerecord', '>= 7.0', '< 8.0'
+  spec.add_runtime_dependency 'tapyrus', '>= 0.3.7'
+  spec.add_runtime_dependency 'activerecord', '>= 7.0', '< 9.0'
   spec.add_runtime_dependency 'kaminari'
   spec.add_runtime_dependency 'mutex_m'
   spec.add_runtime_dependency 'bigdecimal'
-  spec.add_development_dependency 'sqlite3', '~> 1.4'
+  spec.add_development_dependency 'sqlite3', '>= 2.1'
   spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'rails', '>= 7.0', '< 8.0'
+  spec.add_development_dependency 'rails', '>= 7.0', '< 9.0'
 end
diff --git a/lib/glueby/contract/active_record/timestamp.rb b/lib/glueby/contract/active_record/timestamp.rb
@@ -4,8 +4,8 @@ module AR
       class Timestamp < ::ActiveRecord::Base
         include Glueby::GluebyLogger
 
-        enum status: { init: 0, unconfirmed: 1, confirmed: 2 }
-        enum timestamp_type: { simple: 0, trackable: 1 }
+        enum :status, { init: 0, unconfirmed: 1, confirmed: 2 }
+        enum :timestamp_type, { simple: 0, trackable: 1 }
 
         attr_reader :tx
 

diff --git a/lib/glueby/internal/wallet/active_record/key.rb b/lib/glueby/internal/wallet/active_record/key.rb
@@ -10,7 +10,7 @@ class Key < ::ActiveRecord::Base
 
           belongs_to :wallet
 
-          enum purpose: { receive: 0, change: 1 }
+          enum :purpose, { receive: 0, change: 1 }
 
           validates :purpose, presence: true
           validates :private_key, uniqueness: { case_sensitive: false }

diff --git a/lib/glueby/internal/wallet/active_record/utxo.rb b/lib/glueby/internal/wallet/active_record/utxo.rb
@@ -10,7 +10,7 @@ class Utxo < ::ActiveRecord::Base
           validates :txid, uniqueness: { scope: :index, case_sensitive: false }
           validate :check_dust_output
 
-          enum status: { init: 0, broadcasted: 1, finalized: 2 }
+          enum :status, { init: 0, broadcasted: 1, finalized: 2 }
 
           def color_id
             script = Tapyrus::Script.parse_from_payload(script_pubkey.htb)