cocoapods-patch 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8a1091ce7f95d367d0fb5cdcdc01533bade7aa87c3750c03607ca0d0d6893b
-  data.tar.gz: 91ad3babdd2763618a7bedc0bb4186d63558df08c6bbc2a72453e4dcc2fbe555
+  metadata.gz: 1105a246c269e0a64d3e722c32abbec432a34c18e8292a30575278278c7f8eed
+  data.tar.gz: 7940be1b046e9da03058165b59a7e8ea17a5bb041d477b5d43a26d4453e78d39
 SHA512:
-  metadata.gz: 56c086ce0f18238fedb169377d9de115cf50a660d2d5356b78c9c973441fe79e30f98372fcce72242431afcbbe418ae95aaaa23f5986ba9bdbdf551f8a8843ba
-  data.tar.gz: 29cafa7c713700b5ff74a3c82ade35f20885d8411ee9a117be870e473ee60a8d4c58f377c0506ab9e2b4ef382734b1768c4318d65c930000008357178221749d
+  metadata.gz: 6dabcfc809340166278d5fa77752b09497b6c9010460e3ea6fb5d77807d93c12a1eda3bca71c4cafbe6dadf993ccd22c0280820290320ce64b243dca4deed096
+  data.tar.gz: 03bf7d46a65ff0553f3931b76e66f605a0194295170b3c93133f7bc63503de7a25d0b0bfc4e8003b491fdb26f9f0648d4d54b9273223cb678c31225692822e19

data/CHANGELOG.md

@@ -12,6 +12,26 @@ To install or update cocoapods-patch see [README](https://github.com/DoubleSymme
 
 * None.
 
+## 1.2.0 (14.6.23)
+
+##### Enhancements
+
+* cocoapods 1.12.0 compatibility.
+
+##### Bug Fixes
+
+* None.
+
+## 1.0.2 (6.12.21)
+
+##### Enhancements
+
+* None.
+
+##### Bug Fixes
+
+* Revert to previous way of applying patches. There's a bug in Cocoapods that does not call hooks.
+
 ## 1.0.1 (2.11.21)
 
 ##### Enhancements

data/lib/cocoapods_patch.rb

@@ -1,3 +1,3 @@
 module CocoapodsPatch
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/lib/pod/hook.rb

@@ -11,13 +11,30 @@ module CocoapodsPatch
         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
+  end
+end
+
+class Pod::Installer
+  # Because our patches may also delete files, we need to apply them before the pod project is generated
+  # The project is generated in the `integrate` method, so we override it
+  # We first run our patch action and then the original implementation of the method
+  # Reference: https://github.com/CocoaPods/CocoaPods/blob/760828a07f8fcfbff03bce13f56a1789b6f5a95d/lib/cocoapods/installer.rb#L178
+  alias_method :integrate_old, :integrate
+
+  def integrate
+    # apply our patches
+    apply_patches
+    # run the original implementation
+    integrate_old
+  end
 
-    Pod::HooksManager.register('cocoapods-patch', :pre_integrate) do |context|
-      Pod::UI.puts 'Applying patches if necessary'
+  def apply_patches
+    Pod::UI.puts 'Applying patches if necessary'
       patches_dir = Pathname.new(Dir.pwd) + 'patches'
       if patches_dir.directory?
         patches = patches_dir.each_child.select { |c| c.to_s.end_with?('.diff') }
@@ -31,6 +48,7 @@ module CocoapodsPatch
           apply_patch(p)
         end
       end
-    end
   end
 end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-patch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Double Symmetry
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ homepage: https://github.com/DoubleSymmetry/cocoapods-patch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Create & apply patches to Pods
 test_files: []