Remove forked fog-google dependency

carrierwaveuploader · Nov 21, 2022 · 85b5e8e · 85b5e8e
1 parent 1ef4159
commit 85b5e8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,6 +46,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Run RSpec
         run: bundle exec rake spec || [ "$EXPERIMENTAL" == "true" ] && true
       - name: Run Cucumber

diff --git a/gemfiles/rails-6-1.gemfile b/gemfiles/rails-6-1.gemfile
@@ -2,12 +2,8 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
 gem "activemodel-serializers-xml"
-if RUBY_VERSION >= '3'
-  gem 'rmagick', github: 'rmagick/rmagick', platform: :ruby
-  gem 'fog-google', github: 'binti-family/fog-google', branch: 'ruby-3.0'
-end
 gem 'sqlite3', platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
-
+gem "fog-google", "~> 1.13.0" if RUBY_VERSION < '2.7'
 
 gemspec :path => "../"