cocoapods-pod-merge 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15e511e82a904dc11616d9ac811f643216f5d1d34646518ad29a6dbde1e0ec2
-  data.tar.gz: 7a94572e547e895e73f48a99989a81b0444a2fba735e2cc3ac777dbf92845f49
+  metadata.gz: 8b459bb9880825b248a09ba05792ae6c2610fe1d030542f87c768b6be8a97863
+  data.tar.gz: ed15333591feed5844193f04c6d1e958d20d0585b7a8c1e789f4120797a2f0da
 SHA512:
-  metadata.gz: b3d41d5e2c522632f5a42810e6837bb128da441780efb802704cc5af7d5e10076c9c927f096c6a4b3195e058ecfaee4e8de898b74e2673b62f52cad95cca5923
-  data.tar.gz: 3b438bfa2eda55b58bd0740af5aba4401d25e00f813a1d2d29a4071abceaf70f0fa23094e26a5f235328591fd8ab6db523484d28ef4e544cb58a195065b37606
+  metadata.gz: c975c7ff7c90670e90186b8e18d51ee2d13df43dd45a9ff47bfefa090edede0fe9b5a9c19a646fee9614bc92ef8499e19312815542548918188a81912b29ae66
+  data.tar.gz: 9298c5dc639536457934ae3c9cd7db3b65e568e0840bd20047a95885019dbc5dc1e7a1cedbbbeef4b834b7e786ffb19bb28f667ddf7bd097469f7bc08d7746b2

data/lib/cocoapods-pod-merge/Main.rb

@@ -72,6 +72,14 @@ module CocoapodsPodMerge
       add_to_gitignore
     end
 
+    def add_mergefile_to_project(installer_context) 
+      pods_project = Xcodeproj::Project.open(installer_context.pods_project.path)
+      mergefile = pods_project.new_file('../MergeFile')
+      mergefile.explicit_file_type = 'text.script.ruby'
+      mergefile.include_in_index = '1'
+      pods_project.save
+    end
+
     def add_to_gitignore
       gitignore_file = '.gitignore'
 
@@ -247,6 +255,7 @@ module CocoapodsPodMerge
           Dir.glob('**/*.{h,m,mm,swift}').each do |source_file|
             contents = File.read(source_file)
             if has_dependencies
+              # Fix imports of style import xx
               pods_to_merge.each do |pod|
                 modular_imports = contents.scan(%r{<#{pod}/(.+)>})
                 next unless modular_imports&.last
@@ -257,6 +266,15 @@ module CocoapodsPodMerge
                 end
                 File.open(source_file, 'w') { |file| file.puts contents_with_imports_fixed }
               end
+
+              # Fix imports of style import xx
+              pods_to_merge.each do |pod|
+                modular_imports = contents.scan("import #{pod}")
+                next unless modular_imports&.last
+
+                Pod::UI.puts "\t\tExperimental: ".yellow + "Found a module import in #{source_file}, fixing this by removing it".magenta
+                File.open(source_file, 'w') { |file| file.puts contents.gsub("import #{pod}", '') }
+              end
             else
               modular_imports = contents.scan(%r{<#{pod}/(.+)>})
               next unless modular_imports&.last

data/lib/cocoapods-pod-merge/gem_version.rb

@@ -2,5 +2,5 @@
 # Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
 
 module CocoapodsPodMerge
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/cocoapods_plugin.rb

@@ -7,5 +7,9 @@ module CocoapodsPodMerge
     Pod::HooksManager.register('cocoapods-pod-merge', :pre_install) do |installer_context|
         PodMerger.new.begin(installer_context)
     end
+
+    Pod::HooksManager.register('cocoapods-pod-merge', :post_install) do |installer_context|
+        PodMerger.new.add_mergefile_to_project(installer_context)
+    end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pod-merge
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Siddharth Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler