cocoapods-deintegrate 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e5f3c887dc27f68850da1cc1033196dddcef2f7
-  data.tar.gz: f59a5c8a1f79702aa10852ab5588c85051b5485f
+SHA256:
+  metadata.gz: 930de52d74b76bea712792f3a840dc412415f5d44b77d6144399976c89b3bf5b
+  data.tar.gz: 682b46780e5a42d244986f5921a305b6f0211c6ef1b7cfeb39429c2ae6633404
 SHA512:
-  metadata.gz: 11cab2ab5eb4c1e7546d13ae5991e1344d06a65ecfed06f170a29ca51562bd8dc9742839333326a3dd117339ba207a2943a6fd8770c8e6395e0caa1a47c94e2e
-  data.tar.gz: 66eae301893f51564380bd1aff11edce413c5dfa0fdf8b2a4ff92be3e707b81eaaec8a74927bd7bd5d7b99fc5cfb3614e4d8eb5e7b1fbe3c4dbdcb27d277ba8f
+  metadata.gz: f3a0bf2046522590f818ec4de0966eb9e0328b3b6685c6d42d67e956fc86846f9a00d270d2f729ef11b5422742718a322bdfac383752da4d4f3e0820ce5e4706
+  data.tar.gz: 842a10f95c0ebbd4dfdbd856ee4fba3a5ba45f718dfcfc0f5e634ddcbc159566f903586382613605e5a131203bb343e9baf519d112e6404f6c8e8607505b93d4

data/lib/cocoapods/deintegrate/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDeintegrate
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/lib/cocoapods/deintegrator.rb

@@ -2,6 +2,9 @@ module Pod
   class Deintegrator
     include Config::Mixin
 
+    FRAMEWORK_NAMES = /^(libPods.*\.a)|(Pods.*\.framework)$/i
+    XCCONFIG_NAMES = /^Pods.*\.xcconfig$/i
+
     def deintegrate_project(project)
       UI.section("Deintegrating #{UI.path project.path}") do
         project.native_targets.each do |target|
@@ -22,6 +25,7 @@ module Pod
         deintegrate_shell_script_phase(target, 'Copy Pods Resources')
         deintegrate_shell_script_phase(target, 'Check Pods Manifest.lock')
         deintegrate_shell_script_phase(target, 'Embed Pods Frameworks')
+        deintegrate_user_shell_script_phases(target)
         deintegrate_pods_libraries(target)
         deintegrate_configuration_file_references(target)
       end
@@ -36,22 +40,44 @@ module Pod
     end
 
     def deintegrate_pods_libraries(target)
-      frameworks_build_phase = target.frameworks_build_phase
+      # `frameworks_build_phases` returns but does not automatically create this build phase
+      # when we are deinitegrating. Its a bit of a weird API but thats what Xcodeproj gives
+      # us.
+      frameworks_build_phase = target.frameworks_build_phases
+      return if frameworks_build_phase.nil?
 
       pods_build_files = frameworks_build_phase.files.select do |build_file|
-        build_file.display_name =~ /^(libPods.*\.a)|(Pods.*\.framework)$/i
+        build_file.display_name =~ FRAMEWORK_NAMES
       end
 
       unless pods_build_files.empty?
         UI.section('Removing Pod libraries from build phase:') do
           pods_build_files.each do |build_file|
             UI.puts("- #{build_file.display_name}")
+            if build_file.file_ref.build_files.count == 1
+              build_file.file_ref.remove_from_project
+            end
             frameworks_build_phase.remove_build_file(build_file)
           end
         end
       end
     end
 
+    def deintegrate_user_shell_script_phases(target)
+      user_script_phases = target.shell_script_build_phases.select do |phase|
+        next unless phase.name
+        phase.name.start_with?('[CP-User] ')
+      end
+
+      unless user_script_phases.empty?
+        user_script_phases.each do |phase|
+          target.build_phases.delete(phase)
+        end
+
+        UI.puts("Deleted #{user_script_phases.count} user build phases.")
+      end
+    end
+
     def deintegrate_shell_script_phase(target, phase_name)
       phases = target.shell_script_build_phases.select do |phase|
         phase.name && phase.name =~ /#{Regexp.escape(phase_name)}\z$/
@@ -80,7 +106,7 @@ module Pod
     def deintegrate_configuration_file_references(target)
       config_files = target.build_configurations.map do |config|
         config_file = config.base_configuration_reference
-        config_file if config_file && config_file.name =~ /^Pods.*\.xcconfig$/i
+        config_file if config_file && config_file.name =~ XCCONFIG_NAMES
       end.compact
       unless config_files.empty?
         UI.section('Deleting configuration file references') do
@@ -101,7 +127,7 @@ module Pod
 
       pod_files = groups.flat_map do |group|
         group.files.select do |obj|
-          obj.name =~ /^Pods.*\.xcconfig$/i ||
+          obj.name =~ XCCONFIG_NAMES ||
             obj.path =~ /^(libPods.*\.a)|(Pods_.*\.framework)$/i
         end
       end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-deintegrate
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - Kyle Fuller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - kyle@fuller.li
 executables: []
@@ -28,7 +28,7 @@ homepage: https://github.com/kylef/cocoapods-deintegrate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -43,9 +43,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: A CocoaPods plugin to remove and de-integrate CocoaPods from your project.
 test_files: []