Merge main

excid3 · Oct 21, 2023 · 68373d3 · 68373d3
2 parents a870e98 + a970f68
commit 68373d3
Show file tree

Hide file tree

Showing 13 changed files with 352 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
         gemfile:
           - rails_6_1
           - rails_7
+          - rails_7_1
           - rails_main
 
     env:
@@ -53,6 +54,7 @@ jobs:
         gemfile:
           - rails_6_1
           - rails_7
+          - rails_7_1
           - rails_main
 
     env:
@@ -98,6 +100,7 @@ jobs:
         gemfile:
           - rails_6_1
           - rails_7
+          - rails_7_1
           - rails_main
 
     env:

diff --git a/Appraisals b/Appraisals
@@ -6,6 +6,10 @@ appraise "rails-7" do
   gem "rails", "~> 7.0.0"
 end
 
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1.0"
+end
+
 appraise "rails-main" do
   gem "rails", github: "rails/rails", branch: "main"
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ### Unreleased
 
+* Support html safe translations for Rails 7+
+
 ### 1.6.3
 
 * Fix `debug` and `ignore_failure` options in `post` requests. #284 - @mike-burns

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -154,6 +154,8 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-linux)
@@ -237,6 +239,7 @@ GEM
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
+    sqlite3 (1.6.7-arm64-darwin)
     sqlite3 (1.6.7-x86_64-darwin)
     sqlite3 (1.6.7-x86_64-linux)
     standard (1.31.2)
@@ -268,6 +271,7 @@ GEM
     zeitwerk (2.6.12)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-22
   x86_64-linux
 

diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock
@@ -118,7 +118,6 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
     minitest (5.20.0)
     multi_json (1.15.0)
     mysql2 (0.5.5)
@@ -134,8 +133,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
@@ -215,8 +213,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.7)
-      mini_portile2 (~> 2.8.0)
+    sqlite3 (1.6.7-arm64-darwin)
     sqlite3 (1.6.7-x86_64-darwin)
     sqlite3 (1.6.7-x86_64-linux)
     standard (1.31.2)
@@ -246,7 +243,7 @@ GEM
     zeitwerk (2.6.12)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
   x86_64-darwin-22
   x86_64-linux
 
@@ -265,4 +262,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.1
+   2.4.21
diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock
@@ -242,10 +242,7 @@ GEM
     zeitwerk (2.6.12)
 
 PLATFORMS
-  arm64-darwin-21
-  x86_64-darwin-19
-  x86_64-darwin-20
-  x86_64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-22
   x86_64-linux
 
@@ -264,4 +261,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.1
+   2.4.21
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "standard"
+gem "webmock"
+gem "pg"
+gem "mysql2"
+gem "sqlite3", "~> 1.6.0.rc2"
+gem "byebug", group: [:development, :test]
+gem "appraisal"
+gem "net-smtp"
+gem "apnotic", "~> 1.7"
+gem "googleauth", "~> 1.1"
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"