Skip to content

Commit

Permalink
fix gem dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
marcogregorius committed Nov 28, 2022
1 parent 4f1e1d2 commit d5497bb
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 7 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/test.yml
Expand Up @@ -62,6 +62,14 @@ jobs:
run: sudo apt-get install libvips-dev
- name: Set up Ruby
uses: ruby/setup-ruby@v1
if: ${{ matrix.ruby <= 2.6 }}
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
bundler: 1.17.3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
if: ${{ matrix.ruby > 2.6 }}
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
Expand Down
7 changes: 6 additions & 1 deletion carrierwave.gemspec
Expand Up @@ -29,8 +29,13 @@ Gem::Specification.new do |s|
s.add_development_dependency "cucumber", "~> 2.3"
s.add_development_dependency "rspec", "~> 3.4"
s.add_development_dependency "webmock"
s.add_development_dependency "fog-core", "~> 2.1.0"
s.add_development_dependency "fog-aws"
s.add_development_dependency "fog-google", ["~> 1.7", "!= 1.12.1"]
if RUBY_VERSION < '2.7'
s.add_development_dependency "fog-google", "~> 1.7.0"
else
s.add_development_dependency "fog-google"
end
s.add_development_dependency "fog-local"
s.add_development_dependency "fog-rackspace"
s.add_development_dependency "mini_magick", ">= 3.6.0"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails-4-0.gemfile
Expand Up @@ -3,6 +3,6 @@ source "https://rubygems.org"
gem "rails", "~> 4.0.0"
gem "railties", "~> 4.0.0"
gem 'sqlite3', '~> 1.3.6', platforms: :ruby
gem "activerecord-jdbcpostgresql-adapter", "~> 1.3", platforms: :jruby
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]

gemspec :path => "../"
gemspec :path => "../"
4 changes: 2 additions & 2 deletions gemfiles/rails-4-1.gemfile
Expand Up @@ -2,6 +2,6 @@ source "https://rubygems.org"

gem "rails", "~> 4.1.0"
gem 'sqlite3', '~> 1.3.6', platforms: :ruby
gem "activerecord-jdbcpostgresql-adapter", "~> 1.3", platforms: :jruby
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]

gemspec :path => "../"
gemspec :path => "../"
1 change: 0 additions & 1 deletion gemfiles/rails-6-1.gemfile
Expand Up @@ -4,6 +4,5 @@ gem "rails", "~> 6.1.0"
gem "activemodel-serializers-xml"
gem 'sqlite3', platforms: :ruby
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
gem "fog-google", "~> 1.13.0" if RUBY_VERSION < '2.7'

gemspec :path => "../"
6 changes: 5 additions & 1 deletion spec/support/activerecord.rb
Expand Up @@ -6,7 +6,7 @@

ActiveRecord::Migration.verbose = false

if ActiveRecord.version < Gem::Version.new("5.2")
if ActiveRecord.version < Gem::Version.new("5.2") && ActiveRecord.version >= Gem::Version.new("5.0")
module ActiveRecord
module Type
class Json < ActiveModel::Type::Value
Expand Down Expand Up @@ -38,3 +38,7 @@ def accessor

ActiveRecord::Type.register(:json, ActiveRecord::Type::Json, override: false)
end

if ActiveRecord::VERSION::STRING >= '4.2' && ActiveRecord::VERSION::STRING < '5.0'
ActiveRecord::Base.raise_in_transactional_callbacks = true
end

0 comments on commit d5497bb

Please sign in to comment.