From 15f8f50b8fcef35ce656dd1b2ad40108eef445a2 Mon Sep 17 00:00:00 2001 From: Chris Seaton Date: Tue, 29 Oct 2019 14:34:43 -0400 Subject: [PATCH] Remove the cacheable tzinfo-data patch, which has been upstreamed --- .shopify-build/gems/cacheable.patch | 12 ------------ .shopify-build/gems/cacheable.sh | 1 - 2 files changed, 13 deletions(-) delete mode 100644 .shopify-build/gems/cacheable.patch diff --git a/.shopify-build/gems/cacheable.patch b/.shopify-build/gems/cacheable.patch deleted file mode 100644 index 0020e4d3bb69..000000000000 --- a/.shopify-build/gems/cacheable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cacheable.gemspec b/cacheable.gemspec -index 1acbed3..6a776da 100644 ---- a/cacheable.gemspec -+++ b/cacheable.gemspec -@@ -25,6 +25,7 @@ Gem::Specification.new do |s| - s.add_development_dependency "rails", ">= 4.2" - s.add_development_dependency "activesupport" - s.add_development_dependency "actionpack", ">= 4.1" -+ s.add_development_dependency "tzinfo-data", ">= 1.2019.3" - - s.add_runtime_dependency "useragent" - s.add_runtime_dependency "msgpack" diff --git a/.shopify-build/gems/cacheable.sh b/.shopify-build/gems/cacheable.sh index 8aae492c3545..a08b3f70440f 100644 --- a/.shopify-build/gems/cacheable.sh +++ b/.shopify-build/gems/cacheable.sh @@ -1,6 +1,5 @@ repository git@github.com:Shopify/cacheable.git -apply-patch cacheable.patch apply-patch cacheable-gzip-timestamp.patch bundle install