diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 5bd8d281..613b31e9 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: ruby-version: ['3.0', '3.1', '3.2'] - activesupport-version: ['5', '6'] + activesupport-version: ['6', '7'] sinatra-version: ['2', '3'] env: ACTIVESUPPORT_MAJOR: ${{ matrix.activesupport-version }} diff --git a/Gemfile b/Gemfile index e57e3f90..dd3cc015 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" gemspec -gem "activesupport", "~> #{ENV["ACTIVESUPPORT_MAJOR"] || 6}.x" +gem "activesupport", "~> #{ENV["ACTIVESUPPORT_MAJOR"] || 7}.x" gem "sinatra", "~> #{ENV["SINATRA_MAJOR"] || 2}.x" diff --git a/pliny.gemspec b/pliny.gemspec index 4c33b2a0..e764a94f 100644 --- a/pliny.gemspec +++ b/pliny.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |gem| gem.executables = %x{ git ls-files }.split("\n").select { |d| d =~ /^bin\// }.map { |d| d.gsub(/^bin\//, "") } gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(License|README|bin/|data/|ext/|lib/|spec/|test/)} } - gem.add_dependency "activesupport", ">= 5.0.1", "< 7.0" + gem.add_dependency "activesupport", ">= 6.0", "< 8.0" gem.add_dependency "multi_json", "~> 1.9", ">= 1.9.3" gem.add_dependency "prmd", "~> 0.11", ">= 0.11.4" diff --git a/spec/helpers/zulu_time_spec.rb b/spec/helpers/zulu_time_spec.rb index cb2423af..d4ca9a01 100644 --- a/spec/helpers/zulu_time_spec.rb +++ b/spec/helpers/zulu_time_spec.rb @@ -1,5 +1,4 @@ require "spec_helper" -require "active_support/core_ext/numeric/time" describe Pliny::Helpers::ZuluTime do context "zulu_time" do diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 305f7d04..f1997676 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -1,6 +1,5 @@ require "spec_helper" require "open3" -require 'active_support/core_ext/object/blank' describe "Pliny integration test" do describe "bin/setup" do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1ba5e46d..ec51dfed 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,6 +7,7 @@ require "bundler" Bundler.require +require "active_support/all" require "fileutils" require "rack/test" require "sequel"