From 4bd9ce316dbee77001b4249e41c2c308579c2303 Mon Sep 17 00:00:00 2001
From: John Mortlock <john.mortlock@gmail.com>
Date: Sat, 30 Nov 2019 10:54:39 +1030
Subject: [PATCH 1/2] Add support for ActiveSupport6

---
 .travis.yml             | 14 ++++++++++++++
 Gemfile.activesupport60 |  4 ++++
 time_difference.gemspec |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Gemfile.activesupport60

diff --git a/.travis.yml b/.travis.yml
index 6beb99a..b319b0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,25 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
+  - 2.6
+  - jruby
   - jruby-19mode # JRuby in 1.9 mode
+matrix:
+  exclude:
+    - rvm: 2.2
+      gemfile: Gemfile.activesupport60
+    - rvm: 2.3
+      gemfile: Gemfile.activesupport60
+    - rvm: 2.4
+      gemfile: Gemfile.activesupport60
+    - rvm: jruby-19mode
+      gemfile: Gemfile.activesupport60
 # uncomment this line if your project needs to run something other than `rake`:
 script: bundle exec rspec spec
 gemfile:
   - Gemfile.activesupport51
+  - Gemfile.activesupport60
 
 before_install:
   - gem install bundler
\ No newline at end of file
diff --git a/Gemfile.activesupport60 b/Gemfile.activesupport60
new file mode 100644
index 0000000..4cbcabf
--- /dev/null
+++ b/Gemfile.activesupport60
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec
+
+gem 'activesupport', '~> 6.0'
diff --git a/time_difference.gemspec b/time_difference.gemspec
index 5ece9c4..4bdbf72 100644
--- a/time_difference.gemspec
+++ b/time_difference.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.version       = "0.7.0"
   gem.license = 'MIT'
 
-  gem.add_runtime_dependency('activesupport', '~> 5.1')
+  gem.add_runtime_dependency('activesupport', '>= 5.1')
   gem.add_development_dependency('rspec', '~> 3.7.0')
   gem.add_development_dependency('rake')
 

From 74cfe3fdbf2a50dd80d7c0fdf457bf2b9384edd6 Mon Sep 17 00:00:00 2001
From: John Mortlock <john.mortlock@gmail.com>
Date: Sat, 30 Nov 2019 10:59:48 +1030
Subject: [PATCH 2/2] Remove bundler update

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b319b0d..d7443fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,3 @@ script: bundle exec rspec spec
 gemfile:
   - Gemfile.activesupport51
   - Gemfile.activesupport60
-
-before_install:
-  - gem install bundler
\ No newline at end of file