diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a8c5dd7..28c9d9b 100644 --- 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 index 37c2961..b347b11 100644 --- 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 index 2bb0caa..d0ec73d 100644 --- 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 index d00d557..fb84923 100644 --- 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 index f434d98..8b010ba 100644 --- 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 index 9620378..80de0ac 100644 --- 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 index 6c36d62..4826ef5 100644 --- 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 index 131028c..9fe168d 100644 --- 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 index f5fc255..edd3ed7 100644 --- 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 index 5194b50..32d799e 100644 --- a/Gemfile.rails-5.1.haml-4.lock +++ b/Gemfile.rails-5.1.haml-4.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 (4.0.7) tilt i18n (0.9.1) @@ -76,7 +76,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 index 97c83e7..3d02980 100644 --- 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 index 8b95c29..91df2e4 100644 --- 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 @@ -78,7 +78,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 index fdb5b45..ae89bd0 100644 --- 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 index 85ac7f6..1aa66ba 100644 --- 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 index 630d4af..496ed4a 100644 --- 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 index 9c78277..f1f4284 100644 --- 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,7 +40,11 @@ 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) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) racc (1.6.0) @@ -72,12 +76,13 @@ GEM concurrent-ruby (~> 1.0) PLATFORMS + ruby x86_64-linux DEPENDENCIES actionpack (~> 7.0) angular_xss! - gemika + gemika (>= 0.8.1) haml (~> 5) rake rspec