Merge pull request #283 from razeware/dependencies

Upgrading dependencies
razeware · Aug 16, 2024 · 54af3ba · 54af3ba
2 parents 2d2f978 + 34395c8
commit 54af3ba
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 69 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -65,11 +65,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.3.0
+        uses: docker/setup-buildx-action@v3.6.1
         with:
           buildkitd-flags: --debug
 
@@ -108,7 +108,7 @@ jobs:
           echo "::set-output name=tag_list::${TAG_LIST}"
 
       - name: Build and push
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.6.1
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/Gemfile b/Gemfile
@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Stealing some bits from rails
-gem 'activemodel', '< 7.2'
-gem 'activesupport', '< 7.2'
+gem 'activemodel', '< 7.3'
+gem 'activesupport', '< 7.3'
 # Autoloading explictly will use zeitwerk
 gem 'zeitwerk', '~> 2.3'
 
@@ -34,7 +34,7 @@ gem 'aws-sdk-s3', '~> 1.64'
 gem 'concurrent-ruby', '~> 1.1'
 
 # Interacting with github
-gem 'octokit', '~> 8'
+gem 'octokit', '~> 9'
 
 # Interface with libsodium
 gem 'rbnacl'
@@ -61,9 +61,7 @@ gem 'rack-test'
 # Note: This is waiting for support for bundler 3.4 and ruby 3.2 on upstream.
 # https://github.com/dbalatero/levenshtein-ffi/pull/12
 gem 'levenshtein-ffi', require: 'levenshtein', git: 'https://github.com/razeware/levenshtein-ffi.git'
-# NOTE: This is waiting for 3.2 support on upstream.
-# https://github.com/opencoconut/webvtt-ruby/pull/20
-gem 'webvtt-ruby', require: 'webvtt', git: 'https://github.com/razeware/webvtt-ruby.git'
+gem 'webvtt-ruby', require: 'webvtt'
 
 group :development do
   # For integration with VSCode

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -5,54 +5,49 @@ GIT
     levenshtein-ffi (1.1.0)
       ffi (~> 1.9)
 
-GIT
-  remote: https://github.com/razeware/webvtt-ruby.git
-  revision: 12ebc4ad31e3ba16b0f9f9fd068ccef255a54590
-  specs:
-    webvtt-ruby (0.3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activesupport (7.1.3.2)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activesupport (7.2.0)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.916.0)
-    aws-sdk-core (3.192.1)
+    aws-partitions (1.964.0)
+    aws-sdk-core (3.201.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.147.0)
-      aws-sdk-core (~> 3, >= 3.192.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.158.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.9.1)
       aws-eventstream (~> 1, >= 1.0.2)
     backport (1.2.0)
     base64 (0.2.0)
     benchmark (0.3.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     cli-ui (2.2.3)
     coderay (1.1.3)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     daemons (1.4.1)
     diff-lcs (1.5.1)
@@ -62,9 +57,10 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.9.0)
+    faraday (2.10.1)
       faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+      logger
+    faraday-net_http (3.1.1)
       net-http
     faraday-retry (2.2.1)
       faraday (~> 2.0)
@@ -73,10 +69,12 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (~> 0.7)
-    ffi (1.16.3)
+    ffi (1.17.0)
     formatador (1.1.0)
-    git (1.19.1)
+    git (2.1.1)
+      activesupport (>= 5.0)
       addressable (~> 2.8)
+      process_executer (~> 1.1)
       rchardet (~> 1.8)
     google-protobuf (3.22.0)
     guard (2.18.1)
@@ -95,9 +93,9 @@ GEM
       guard-compat (~> 1.0)
       multi_json (~> 1.8)
     http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.6)
+    jaro_winkler (1.6.0)
     jmespath (1.6.2)
     json (2.7.2)
     kramdown (2.4.0)
@@ -108,38 +106,38 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     lumberjack (1.2.10)
     method_source (1.1.0)
-    mini_magick (4.12.0)
-    mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    mini_magick (5.0.1)
+    mini_portile2 (2.8.7)
+    minitest (5.25.0)
     multi_json (1.15.0)
-    mustermann (3.0.0)
+    mustermann (3.0.2)
       ruby2_keywords (~> 0.0.1)
-    mutex_m (0.2.0)
     nenv (0.3.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.4)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (8.1.0)
-      base64
+    octokit (9.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.2)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
+    process_executer (1.1.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.5)
-    racc (1.7.3)
-    rack (3.0.10)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (3.0.11)
     rack-livereload (0.6.0)
       rack (~> 3.0.8)
     rack-protection (4.0.0)
@@ -155,29 +153,30 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rbnacl (7.1.1)
       ffi
     rbs (2.8.4)
     rchardet (1.8.0)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.6)
-    rubocop (1.63.2)
+    rexml (3.3.5)
+      strscan
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.32.0)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sass-embedded (1.62.1)
@@ -186,6 +185,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    securerandom (0.3.1)
     shellany (0.0.1)
     sinatra (4.0.0)
       mustermann (~> 3.0)
@@ -210,12 +210,13 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
+    strscan (3.1.0)
     thin (1.6.2)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (1.3.1)
-    tilt (2.3.0)
+    tilt (2.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -224,15 +225,16 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    webvtt-ruby (0.4.2)
     yard (0.9.36)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (< 7.2)
-  activesupport (< 7.2)
+  activemodel (< 7.3)
+  activesupport (< 7.3)
   aws-sdk-s3 (~> 1.64)
   cli-ui (~> 2)
   commonmarker (< 1)
@@ -246,7 +248,7 @@ DEPENDENCIES
   guard-livereload
   levenshtein-ffi!
   mini_magick
-  octokit (~> 8)
+  octokit (~> 9)
   rack-livereload
   rack-test
   rackup
@@ -258,8 +260,8 @@ DEPENDENCIES
   solargraph (~> 0.39)
   thin
   thor (~> 1.0, >= 1.0.1)
-  webvtt-ruby!
+  webvtt-ruby
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.5.4
+   2.5.17
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   app:
     build: