From 1eb18d87260ecfff51b6e2462ea2e5a8e3bc265a Mon Sep 17 00:00:00 2001
From: Sebastian Celis <sebastian@sebastiancelis.com>
Date: Thu, 9 Jul 2020 12:55:36 -0500
Subject: [PATCH 1/2] Update rubyzip to ~> 2.0

---
 twine.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/twine.gemspec b/twine.gemspec
index cbec1ac..4c9f81b 100644
--- a/twine.gemspec
+++ b/twine.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files   = Dir.glob("test/test_*")
 
   s.required_ruby_version = ">= 2.0"
-  s.add_runtime_dependency('rubyzip', "~> 1.1")
+  s.add_runtime_dependency('rubyzip', "~> 2.0")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
   s.add_development_dependency('rake', "~> 13.0")
   s.add_development_dependency('minitest', "~> 5.5")

From 6e70c0523590d2f96fbdb08a9fce709a830ae3fb Mon Sep 17 00:00:00 2001
From: Sebastian Celis <sebastian@sebastiancelis.com>
Date: Thu, 9 Jul 2020 13:01:31 -0500
Subject: [PATCH 2/2] Update minimum ruby version to 2.4

Also add CircleCI tests for Ruby 2.6 and 2.7
---
 .circleci/config.yml | 32 ++++++++++++++++----------------
 twine.gemspec        |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a68d1c..76b29b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,19 +1,5 @@
 version: 2.0
 jobs:
-    "ruby-2.2":
-        docker:
-            - image: circleci/ruby:2.2
-        steps:
-            - checkout
-            - run: bundle install
-            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
-    "ruby-2.3":
-        docker:
-            - image: circleci/ruby:2.3
-        steps:
-            - checkout
-            - run: bundle install
-            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
     "ruby-2.4":
         docker:
             - image: circleci/ruby:2.4
@@ -28,11 +14,25 @@ jobs:
             - checkout
             - run: bundle install
             - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
+    "ruby-2.6":
+        docker:
+            - image: circleci/ruby:2.6
+        steps:
+            - checkout
+            - run: bundle install
+            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
+    "ruby-2.7":
+        docker:
+            - image: circleci/ruby:2.7
+        steps:
+            - checkout
+            - run: bundle install
+            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
 workflows:
     version: 2
     build:
         jobs:
-            - "ruby-2.2"
-            - "ruby-2.3"
             - "ruby-2.4"
             - "ruby-2.5"
+            - "ruby-2.6"
+            - "ruby-2.7"
diff --git a/twine.gemspec b/twine.gemspec
index 4c9f81b..b32ca05 100644
--- a/twine.gemspec
+++ b/twine.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files       += Dir.glob("test/**/*")
   s.test_files   = Dir.glob("test/test_*")
 
-  s.required_ruby_version = ">= 2.0"
+  s.required_ruby_version = ">= 2.4"
   s.add_runtime_dependency('rubyzip', "~> 2.0")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
   s.add_development_dependency('rake', "~> 13.0")