Merge pull request #955 from tdiary/update_bundles

update bundles

Author: tdtds

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     name: build (${{ matrix.ruby }}/${{ matrix.test_mode }})
     strategy:
       matrix:
-        ruby: [ '3.0', 2.6 ]
+        ruby: [ '3.0', '2.7', '2.6' ]
         test_mode: [ rack, gem ]
     runs-on: ubuntu-latest
     steps:

Gemfile.lock

@@ -26,22 +26,27 @@ GEM
     docile (1.4.0)
     emot (0.0.4)
       thor
-    faraday (1.4.2)
+    faraday (1.7.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     fastimage (2.2.5)
     hikidoc (0.1.0)
-    io-wait (0.1.0)
     jasmine (2.99.0)
       jasmine-core (>= 2.99.0, < 3.0.0)
       phantomjs
@@ -55,26 +60,19 @@ GEM
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.2)
-      net-ftp (~> 0.1)
+    mime-types-data (3.2021.0704)
+    mini_mime (1.1.1)
+    mini_portile2 (2.6.1)
     multipart-post (2.1.1)
-    net-ftp (0.1.2)
-      net-protocol
-      time
-    net-protocol (0.1.0)
-      io-wait
-      timeout
-    nokogiri (1.11.6)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.3)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     phantomjs (2.1.1.0)
     pit (0.0.7)
-    power_assert (2.0.0)
+    power_assert (2.0.1)
     public_suffix (4.0.6)
     racc (1.5.2)
     rack (2.2.3)
@@ -102,8 +100,8 @@ GEM
     rspec-support (3.10.2)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
-    ruby2_keywords (0.0.4)
-    rubyzip (2.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -123,9 +121,6 @@ GEM
     test-unit (3.4.4)
       power_assert
     thor (1.1.0)
-    time (0.1.0)
-      date
-    timeout (0.1.1)
     tins (1.29.1)
       sync
     webrick (1.7.0)
@@ -164,4 +159,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.2.15
+   2.2.22

misc/paas/heroku/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/tdiary/tdiary-contrib.git
-  revision: d1e41204db13879c22787fff1bae2446590bdfc8
+  revision: 462b794cc7a4d4b7c7f179a01823bb5f5453c1c1
   specs:
-    tdiary-contrib (5.1.5)
+    tdiary-contrib (5.1.6)
       coderay
       holiday_japan
       pushbullet_ruby
@@ -21,15 +21,15 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activesupport (6.1.3.2)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     bson (4.12.1)
     capybara (3.35.3)
@@ -42,9 +42,8 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
-    commonmarker (0.21.2)
-      ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.8)
+    commonmarker (0.22.0)
+    concurrent-ruby (1.1.9)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -62,13 +61,13 @@ GEM
       thor
     faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    fastimage (2.2.3)
+    fastimage (2.2.5)
     hashie (4.1.0)
     hikidoc (0.1.0)
     holiday_japan (1.4.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    idn-ruby (0.1.0)
+    idn-ruby (0.1.2)
     jasmine (2.99.0)
       jasmine-core (>= 2.99.0, < 3.0.0)
       phantomjs
@@ -83,17 +82,18 @@ GEM
     memcachier (0.0.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_mime (1.1.0)
+    mime-types-data (3.2021.0704)
+    mini_mime (1.1.1)
     minitest (5.14.4)
-    mongo (2.14.0)
+    mongo (2.15.0)
       bson (>= 4.8.2, < 5.0.0)
-    mongoid (7.3.0)
+    mongoid (7.3.2)
       activemodel (>= 5.1, < 6.2)
       mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
     multipart-post (2.1.1)
-    nio4r (2.5.7)
-    nokogiri (1.11.6-x86_64-linux)
+    nio4r (2.5.8)
+    nokogiri (1.12.3-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.6)
     octokit (4.21.0)
@@ -111,9 +111,9 @@ GEM
       rack
     phantomjs (2.1.1.0)
     pit (0.0.7)
-    power_assert (2.0.0)
+    power_assert (2.0.1)
     public_suffix (4.0.6)
-    puma (5.3.2)
+    puma (5.4.0)
       nio4r (~> 2.0)
     pushbullet_ruby (1.1.4)
       faraday (>= 0.13.0, < 1.0)
@@ -127,7 +127,7 @@ GEM
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rake (13.0.3)
+    rake (13.0.6)
     rdtool (0.6.38)
     redcarpet (3.5.1)
     regexp_parser (2.1.1)
@@ -147,24 +147,23 @@ GEM
     rspec-support (3.10.2)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
-    ruby-enum (0.9.0)
-      i18n
-    rubyzip (2.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sequel (5.44.0)
+    sequel (5.47.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sqlite3 (1.4.2)
     sync (0.5.0)
-    tdiary (5.1.5)
+    tdiary (5.1.6)
       bundler (>= 1.3, < 3.0)
       emot
       fastimage
@@ -183,7 +182,7 @@ GEM
       rdtool
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.4.1)
+    test-unit (3.4.4)
       power_assert
     thor (1.1.0)
     tins (1.29.1)
@@ -242,7 +241,7 @@ DEPENDENCIES
   webrick
 
 RUBY VERSION
-   ruby 3.0.1p64
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.2.15
+   2.2.22