diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d5c839..f6ee3bc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.0.0 + ruby-version: 3.3.0 bundler-cache: true - name: Run tests diff --git a/.ruby-version b/.ruby-version index 75a22a2..15a2799 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.3 +3.3.0 diff --git a/lib/rails_twirp/mapper.rb b/lib/rails_twirp/mapper.rb index 06858de..6b178e2 100644 --- a/lib/rails_twirp/mapper.rb +++ b/lib/rails_twirp/mapper.rb @@ -59,10 +59,10 @@ def initialize(route_set) @module = nil end - def service(service_definition, **options, &block) + def service(service_definition, **, &block) service_route_set = @route_set.services[service_definition] service_mapper = ServiceMapper.new(service_route_set, self) - scope(**options) { service_mapper.instance_exec(&block) } + scope(**) { service_mapper.instance_exec(&block) } end def scope(**options) diff --git a/rails_twirp.gemspec b/rails_twirp.gemspec index 4f80d07..c2ef457 100644 --- a/rails_twirp.gemspec +++ b/rails_twirp.gemspec @@ -13,7 +13,10 @@ Gem::Specification.new do |spec| spec.files = `git ls-files`.split("\n") - spec.add_dependency "rails", ">= 6.1.3" - spec.add_dependency "twirp", ">= 1.9", "< 1.11" + # Rails has shipped an incompatible change in ActiveView, that was reverted in later versions. + # @see https://github.com/rails/rails/pull/51023 + excluded_versions = ["7.1.0", "7.1.1", "7.1.2", "7.1.3"].map { |v| "!= #{v}" } + spec.add_runtime_dependency "rails", ">= 6.1.3", *excluded_versions + spec.add_runtime_dependency "twirp", ">= 1.9", "< 1.11" spec.required_ruby_version = ">= 3" end