merge master

.github/workflows/ci.yml

@@ -49,19 +49,23 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
-  deploy:
+  release-gem:
     runs-on: ubuntu-latest
-
     environment: Deploy
 
+    permissions:
+      id-token: write
+      contents: write
+
     # Run on push to master branch
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: umbrellio/publish-ruby-gem-action@v1.0.4
+      - uses: ruby/setup-ruby@v1
         with:
-          api-key: ${{ secrets.RUBYGEMS_API_KEY }}
-        env:
-          PUBLISH_JOB: true
+          ruby-version: ruby
+          bundler-cache: true
+
+      - uses: rubygems/release-gem@v1

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "async", "1.31.0" # TODO: Remove version binding after Ruby 2.7 and 3.0 support drop.
+gem "async"
 gem "money"
 gem "pg"
 gem "pry"

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.16.0)
+    umbrellio-sequel-plugins (0.16.1)
       sequel
 
 GEM
@@ -18,7 +18,7 @@ GEM
       mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    async (1.31.0)
+    async (1.32.1)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
@@ -50,7 +50,7 @@ GEM
     parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.7)
+    pg (1.5.8)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -66,7 +66,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -123,22 +123,21 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     symbiont-ruby (0.7.0)
     timers (4.3.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   arm64-darwin-23
-  x86_64-darwin-21
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
-  async (= 1.31.0)
+  async
   money
   pg
   pry

lib/sequel/extensions/fibered_connection_pool.rb

@@ -77,14 +77,8 @@ def connection_pool_class(*)
   end
 end
 
-# NOTE: Ruby 2.7 DOES NOT SUPPORT class methods prepend in this way
-# https://bugs.ruby-lang.org/issues/17423
-if RUBY_VERSION > "3"
-  Sequel::ConnectionPool::ClassMethods.prepend(Sequel::ConnectionPoolPatch)
-else
-  class Sequel::ConnectionPool
-    class << self
-      prepend Sequel::ConnectionPoolPatch
-    end
+class Sequel::ConnectionPool
+  class << self
+    prepend Sequel::ConnectionPoolPatch
   end
 end

umbrellio-sequel-plugins.gemspec

@@ -4,14 +4,8 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.17.0"
-
-  if ENV.fetch("PUBLISH_JOB", nil)
-    release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"
-  end
-
   spec.name = "umbrellio-sequel-plugins"
-  spec.version = release_version || gem_version
+  spec.version = "0.16.1"
   spec.required_ruby_version = ">= 3.0"
 
   spec.authors = ["Team Umbrellio"]