Skip to content

Commit

Permalink
Merge pull request #357 from interagent/bf/update-activesupport
Browse files Browse the repository at this point in the history
update supported activesupport versions
  • Loading branch information
beanieboi authored Oct 9, 2023
2 parents 1248474 + ad6c3e1 commit e7d3c0b
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion pliny.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion spec/helpers/zulu_time_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require "spec_helper"
require "active_support/core_ext/numeric/time"

describe Pliny::Helpers::ZuluTime do
context "zulu_time" do
Expand Down
1 change: 0 additions & 1 deletion spec/integration_spec.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
require "bundler"
Bundler.require

require "active_support/all"
require "fileutils"
require "rack/test"
require "sequel"
Expand Down

0 comments on commit e7d3c0b

Please sign in to comment.