feat(cocoapods): cocoapods 1.12.0 compatibility (#26)

Author: crherman7

CHANGELOG.md

@@ -12,6 +12,16 @@ To install or update cocoapods-patch see [README](https://github.com/DoubleSymme
 
 * None.
 
+## 1.0.3 (3.3.23)
+
+##### Enhancements
+
+* cocoapods 1.12.0 compatibility.
+
+##### Bug Fixes
+
+* None.
+
 ## 1.0.2 (6.12.21)
 
 ##### Enhancements

Gemfile.lock

@@ -1,47 +1,46 @@
 PATH
   remote: .
   specs:
-    cocoapods-patch (1.0.0)
-      cocoapods (~> 1.11.0)
+    cocoapods-patch (1.0.3)
+      cocoapods (~> 1.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.4.1)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.3)
-    cocoapods (1.11.2)
+    claide (1.1.0)
+    cocoapods (1.12.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.2)
+      cocoapods-core (= 1.12.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 1.6.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
+      ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.2)
-      activesupport (>= 5.0, < 7)
+    cocoapods-core (1.12.0)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -51,7 +50,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.5.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -60,25 +59,25 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.14.4)
+    json (2.6.3)
+    minitest (5.17.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.3)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -97,18 +96,18 @@ GEM
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.1)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
   x86_64-linux
 

cocoapods-patch.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['*.md', 'lib/**/*', 'LICENSE']
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "cocoapods", "~> 1.11.0"
+  spec.add_runtime_dependency "cocoapods", "~> 1.12.0"
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'

lib/cocoapods_patch.rb

@@ -1,3 +1,3 @@
 module CocoapodsPatch
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

lib/pod/hook.rb

@@ -11,7 +11,8 @@ module Hooks
         patches = patches_dir.each_child.select { |c| c.to_s.end_with?('.diff') }
         patches.each do |p|
           pod_name = File.basename(p, ".diff")
-          context.sandbox.clean_pod(pod_name)
+          pod_dir = context.sandbox.pod_dir(pod_name)
+          context.sandbox.clean_pod(pod_name, pod_dir)
         end
       end
     end