[SWAT][#184347422] Kompabilität auf Ruby 3.2 hochziehen

makandra · Feb 23, 2024 · 512cd2c · 512cd2c
1 parent 56ff8ab
commit 512cd2c
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 37 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,13 +34,13 @@ jobs:
  - ruby: 2.7.2
  gemfile: Gemfile.rails-7.0.haml-5
 
- - ruby: 3.0.1
+ - ruby: 3.2.3
  gemfile: Gemfile.rails-5.1.haml-4
- - ruby: 3.0.1
+ - ruby: 3.2.3
  gemfile: Gemfile.rails-5.1.haml-5
- - ruby: 3.0.1
+ - ruby: 3.2.3
  gemfile: Gemfile.rails-6.1.haml-5
- - ruby: 3.0.1
+ - ruby: 3.2.3
  gemfile: Gemfile.rails-7.0.haml-5
  env:
  BUNDLE_GEMFILE: "${{ matrix.gemfile }}"

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.2
+3.2.3
diff --git a/Gemfile.rails-3.2 b/Gemfile.rails-3.2
@@ -5,5 +5,5 @@ gem 'actionpack', '~>3.2'
 gem 'rspec'
 gem 'haml', '=4.0.2'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.3'
 gem 'rake'
diff --git a/Gemfile.rails-3.2.lock b/Gemfile.rails-3.2.lock
@@ -28,7 +28,7 @@ GEM
  concurrent-ruby (1.0.5)
  diff-lcs (1.3)
  erubis (2.7.0)
- gemika (0.6.1)
+ gemika (0.8.3)
  haml (4.0.2)
  tilt
  hike (1.2.3)
@@ -81,11 +81,11 @@ PLATFORMS
 DEPENDENCIES
  actionpack (~> 3.2)
  angular_xss!
- gemika
+ gemika (>= 0.8.3)
  haml (= 4.0.2)
  railties (~> 3.2)
  rake
  rspec
 
 BUNDLED WITH
- 1.17.3
+ 2.1.4
diff --git a/Gemfile.rails-4.2.haml-4 b/Gemfile.rails-4.2.haml-4
@@ -4,5 +4,5 @@ gem 'actionpack', '~>4.2'
 gem 'rspec'
 gem 'haml', '<5'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 gem 'rake'
diff --git a/Gemfile.rails-4.2.haml-4.lock b/Gemfile.rails-4.2.haml-4.lock
@@ -31,7 +31,7 @@ GEM
  crass (1.0.3)
  diff-lcs (1.3)
  erubis (2.7.0)
- gemika (0.6.1)
+ gemika (0.8.3)
  haml (4.0.7)
  tilt
  i18n (0.9.1)
@@ -79,10 +79,10 @@ PLATFORMS
 DEPENDENCIES
  actionpack (~> 4.2)
  angular_xss!
- gemika
+ gemika (>= 0.8.1)
  haml (< 5)
  rake
  rspec
 
 BUNDLED WITH
- 1.17.3
+ 2.1.4
diff --git a/Gemfile.rails-4.2.haml-5 b/Gemfile.rails-4.2.haml-5
@@ -4,5 +4,5 @@ gem 'actionpack', '~>4.2'
 gem 'rspec'
 gem 'haml', '~> 5'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 gem 'rake'
diff --git a/Gemfile.rails-4.2.haml-5.lock b/Gemfile.rails-4.2.haml-5.lock
@@ -31,7 +31,7 @@ GEM
  crass (1.0.3)
  diff-lcs (1.3)
  erubis (2.7.0)
- gemika (0.6.1)
+ gemika (0.8.3)
  haml (5.0.4)
  temple (>= 0.8.0)
  tilt
@@ -81,10 +81,10 @@ PLATFORMS
 DEPENDENCIES
  actionpack (~> 4.2)
  angular_xss!
- gemika
+ gemika (>= 0.8.1)
  haml (~> 5)
  rake
  rspec
 
 BUNDLED WITH
- 1.17.3
+ 2.1.4
diff --git a/Gemfile.rails-5.1.haml-4 b/Gemfile.rails-5.1.haml-4
@@ -4,5 +4,5 @@ gem 'actionpack', '~>5.1'
 gem 'rspec'
 gem 'haml', '< 5'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 gem 'rake'
diff --git a/Gemfile.rails-5.1.haml-4.lock b/Gemfile.rails-5.1.haml-4.lock
@@ -31,18 +31,20 @@ GEM
  crass (1.0.3)
  diff-lcs (1.3)
  erubi (1.7.0)
- gemika (0.6.1)
+ gemika (0.8.3)
  haml (4.0.7)
  tilt
  i18n (0.9.1)
  concurrent-ruby (~> 1.0)
  loofah (2.1.1)
  crass (~> 1.0.2)
  nokogiri (>= 1.5.9)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.5.3)
  minitest (5.10.3)
- nokogiri (1.8.1)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.11.7)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
+ racc (1.7.3)
  rack (2.0.3)
  rack-test (0.8.2)
  rack (>= 1.0, < 3)
@@ -76,7 +78,7 @@ PLATFORMS
 DEPENDENCIES
  actionpack (~> 5.1)
  angular_xss!
- gemika
+ gemika (>= 0.8.1)
  haml (< 5)
  rake
  rspec

diff --git a/Gemfile.rails-5.1.haml-5 b/Gemfile.rails-5.1.haml-5
@@ -4,5 +4,5 @@ gem 'actionpack', '~>5.1'
 gem 'rspec'
 gem 'haml', '~> 5'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 gem 'rake'
diff --git a/Gemfile.rails-5.1.haml-5.lock b/Gemfile.rails-5.1.haml-5.lock
@@ -31,7 +31,7 @@ GEM
  crass (1.0.3)
  diff-lcs (1.3)
  erubi (1.7.0)
- gemika (0.6.1)
+ gemika (0.8.3)
  haml (5.0.4)
  temple (>= 0.8.0)
  tilt
@@ -40,10 +40,12 @@ GEM
  loofah (2.1.1)
  crass (~> 1.0.2)
  nokogiri (>= 1.5.9)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.5.3)
  minitest (5.10.3)
- nokogiri (1.8.1)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.11.7)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
+ racc (1.7.3)
  rack (2.0.3)
  rack-test (0.8.2)
  rack (>= 1.0, < 3)
@@ -78,7 +80,7 @@ PLATFORMS
 DEPENDENCIES
  actionpack (~> 5.1)
  angular_xss!
- gemika
+ gemika (>= 0.8.1)
  haml (~> 5)
  rake
  rspec

diff --git a/Gemfile.rails-6.1.haml-5 b/Gemfile.rails-6.1.haml-5
@@ -4,5 +4,5 @@ gem 'actionpack', '~>6.1'
 gem 'rspec'
 gem 'haml', '~> 5'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 gem 'rake'
diff --git a/Gemfile.rails-6.1.haml-5.lock b/Gemfile.rails-6.1.haml-5.lock
@@ -32,7 +32,7 @@ GEM
  crass (1.0.6)
  diff-lcs (1.4.4)
  erubi (1.10.0)
- gemika (0.6.0)
+ gemika (0.8.3)
  haml (5.2.1)
  temple (>= 0.8.0)
  tilt
@@ -81,7 +81,7 @@ PLATFORMS
 DEPENDENCIES
  actionpack (~> 6.1)
  angular_xss!
- gemika
+ gemika (>= 0.8.1)
  haml (~> 5)
  rake
  rspec

diff --git a/Gemfile.rails-7.0.haml-5 b/Gemfile.rails-7.0.haml-5
@@ -4,5 +4,5 @@ gem 'actionpack', '~>7.0'
 gem 'rspec'
 gem 'haml', '~> 5'
 gem 'angular_xss', :path => '.'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 gem 'rake'
diff --git a/Gemfile.rails-7.0.haml-5.lock b/Gemfile.rails-7.0.haml-5.lock
@@ -31,7 +31,7 @@ GEM
  crass (1.0.6)
  diff-lcs (1.4.4)
  erubi (1.10.0)
- gemika (0.6.1)
+ gemika (0.8.3)
  haml (5.2.2)
  temple (>= 0.8.0)
  tilt
@@ -40,8 +40,10 @@ GEM
  loofah (2.13.0)
  crass (~> 1.0.2)
  nokogiri (>= 1.5.9)
+ mini_portile2 (2.6.1)
  minitest (5.15.0)
- nokogiri (1.12.5-x86_64-linux)
+ nokogiri (1.12.5)
+ mini_portile2 (~> 2.6.1)
  racc (~> 1.4)
  racc (1.6.0)
  rack (2.2.3)
@@ -72,12 +74,12 @@ GEM
  concurrent-ruby (~> 1.0)
 
 PLATFORMS
- x86_64-linux
+ ruby
 
 DEPENDENCIES
  actionpack (~> 7.0)
  angular_xss!
- gemika
+ gemika (>= 0.8.1)
  haml (~> 5)
  rake
  rspec