Remove support for EOL Ruby 2.6/2.7, Rails 5.2/6.0

flippercloud · Nov 30, 2023 · 225823c · 225823c
1 parent d149229
commit 225823c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 58 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,25 +15,9 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
-        rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']
+        ruby: ['3.0', '3.1', '3.2']
+        rails: ['6.1.0', '7.0.0', '7.1.0']
         exclude:
-          - ruby: "2.6"
-            rails: "7.1.0"
-          - ruby: "2.6"
-            rails: "7.0.0"
-          - ruby: "2.7"
-            rails: "7.1.0"
-          - ruby: "3.0"
-            rails: "5.2"
-          - ruby: "3.1"
-            rails: "5.2"
-          - ruby: "3.1"
-            rails: "6.0.0"
-          - ruby: "3.2"
-            rails: "5.2"
-          - ruby: "3.2"
-            rails: "6.0.0"
           - ruby: "3.2"
             rails: "6.1.0"
     env:

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -16,25 +16,9 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
-        rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']
+        ruby: ['3.0', '3.1', '3.2']
+        rails: ['6.1.0', '7.0.0', '7.1.0']
         exclude:
-          - ruby: "2.6"
-            rails: "7.1.0"
-          - ruby: "2.6"
-            rails: "7.0.0"
-          - ruby: "2.7"
-            rails: "7.1.0"
-          - ruby: "3.0"
-            rails: "5.2"
-          - ruby: "3.1"
-            rails: "5.2"
-          - ruby: "3.1"
-            rails: "6.0.0"
-          - ruby: "3.2"
-            rails: "5.2"
-          - ruby: "3.2"
-            rails: "6.0.0"
           - ruby: "3.2"
             rails: "6.1.0"
     env:

diff --git a/lib/flipper/adapters/memoizable.rb b/lib/flipper/adapters/memoizable.rb
@@ -143,14 +143,8 @@ def memoizing?
         !!@memoize
       end
 
-      if RUBY_VERSION >= '3.0'
-        def method_missing(name, *args, **kwargs, &block)
-          @adapter.send name, *args, **kwargs, &block
-        end
-      else
-        def method_missing(name, *args, &block)
-          @adapter.send name, *args, &block
-        end
+      def method_missing(name, *args, **kwargs, &block)
+        @adapter.send name, *args, **kwargs, &block
       end
 
       private

diff --git a/lib/flipper/types/actor.rb b/lib/flipper/types/actor.rb
@@ -23,14 +23,8 @@ def respond_to?(*args)
         super || @actor.respond_to?(*args)
       end
 
-      if RUBY_VERSION >= '3.0'
-        def method_missing(name, *args, **kwargs, &block)
-          @actor.send name, *args, **kwargs, &block
-        end
-      else
-        def method_missing(name, *args, &block)
-          @actor.send name, *args, &block
-        end
+      def method_missing(name, *args, **kwargs, &block)
+        @actor.send name, *args, **kwargs, &block
       end
     end
   end

diff --git a/spec/flipper/cloud_spec.rb b/spec/flipper/cloud_spec.rb
@@ -94,12 +94,10 @@
     described_class.new(token: 'asdf', open_timeout: 1)
   end
 
-  if RUBY_VERSION >= '2.6.0'
-    it 'can set write_timeout' do
-      expect(Flipper::Adapters::Http::Client).to receive(:new)
-        .with(hash_including(open_timeout: 1)).at_least(:once)
-      described_class.new(token: 'asdf', open_timeout: 1)
-    end
+  it 'can set write_timeout' do
+    expect(Flipper::Adapters::Http::Client).to receive(:new)
+      .with(hash_including(open_timeout: 1)).at_least(:once)
+    described_class.new(token: 'asdf', open_timeout: 1)
   end
 
   it 'can import' do