Drop support for Ruby < 2.2 and Rails 4.x

carrierwaveuploader · Mar 30, 2019 · bada043 · bada043
1 parent aa85ea7
commit bada043
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,9 +11,6 @@ rvm:
   - jruby-9.2.5.0
 
 gemfile:
-  - gemfiles/rails-4-0.gemfile
-  - gemfiles/rails-4-1.gemfile
-  - gemfiles/rails-4-2.gemfile
   - gemfiles/rails-5-0.gemfile
   - gemfiles/rails-5-1.gemfile
   - gemfiles/rails-5-2.gemfile
@@ -30,18 +27,6 @@ before_script:
 
 matrix:
   include:
-    - rvm: 2.0
-      gemfile: gemfiles/rails-4-0.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails-4-1.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails-4-2.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails-4-0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails-4-1.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails-4-2.gemfile
     - rvm: 2.6.0
       gemfile: gemfiles/rails-master.gemfile
     - rvm: ruby-head
@@ -52,25 +37,6 @@ matrix:
       gemfile: gemfiles/rails-5-0.gemfile
     - rvm: jruby-head
       gemfile: gemfiles/rails-5-1.gemfile
-  exclude:
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails-4-0.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails-4-1.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails-4-0.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails-4-1.gemfile
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails-4-0.gemfile
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails-4-1.gemfile
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails-4-2.gemfile
-    - rvm: jruby-9.2.5.0
-      gemfile: gemfiles/rails-4-0.gemfile
-    - rvm: jruby-9.2.5.0
-      gemfile: gemfiles/rails-4-1.gemfile
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

diff --git a/carrierwave.gemspec b/carrierwave.gemspec
@@ -19,17 +19,17 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.licenses = ["MIT"]
 
-  s.required_ruby_version = ">= 2.0.0"
+  s.required_ruby_version = ">= 2.2.2"
 
-  s.add_dependency "activesupport", ">= 4.0.0"
-  s.add_dependency "activemodel", ">= 4.0.0"
+  s.add_dependency "activesupport", ">= 5.0.0"
+  s.add_dependency "activemodel", ">= 5.0.0"
   s.add_dependency "mime-types", ">= 1.16"
   if RUBY_ENGINE == 'jruby'
     s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
   else
     s.add_development_dependency "pg"
   end
-  s.add_development_dependency "rails", ">= 4.0.0"
+  s.add_development_dependency "rails", ">= 5.0.0"
   s.add_development_dependency "cucumber", "~> 2.3"
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "webmock"

diff --git a/gemfiles/rails-4-0.gemfile b/gemfiles/rails-4-0.gemfile
diff --git a/gemfiles/rails-4-1.gemfile b/gemfiles/rails-4-1.gemfile
diff --git a/gemfiles/rails-4-2.gemfile b/gemfiles/rails-4-2.gemfile
diff --git a/lib/carrierwave/uploader.rb b/lib/carrierwave/uploader.rb
@@ -43,15 +43,6 @@ module Uploader
     class Base
       attr_reader :file
 
-      ##
-      # Workaround for class_attribute malfunction when used with Module#prepend
-      #
-      if RUBY_VERSION < '2.1.0'
-        def self.singleton_class?
-          !ancestors.include? self
-        end
-      end
-
       include CarrierWave::Uploader::Configuration
       include CarrierWave::Uploader::Callbacks
       include CarrierWave::Uploader::Proxy