cocoapods-binary-artifactory-cache 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1273050331a8b3d8610e12688032d34c6f9040cb2f55f19a7cd04db82ee872be
-  data.tar.gz: 95b1db27646e934d2cf3bbd9011f881ba886f33225ede9a03a97a00997cdcb89
+  metadata.gz: 36950b359fd58cf20b6961d93dbeaf5e35e2f77bd2a6c7a70becb43fde143b72
+  data.tar.gz: c662bf7cc890f0cf1714a6c7ebddb452f599ee949290b5f87c2a87dfd5d1ca9a
 SHA512:
-  metadata.gz: 137a0cd00be76f55d4b8b087c1680769510b0f17cd38274bbcc6b0678f28a45edfb0140f4de0ba539b3041d806e47604ccb020cff3796d4b13e1d2f00708bd56
-  data.tar.gz: b4292daf6c46cbf4168e9cbf58f16eaa7f3bcbab4c4235b902aad8ea105938ee23ffc74d9ffc8b6bfb515908d68c7c7fe883821167f3590ac7aa0efdf15803a4
+  metadata.gz: 87e0388dc105be402cfa7e14c668322874b0acd63063db6f39d7c7f2ef10621730da0b80f58ffe91133e95403678aaddad0e4695a2b05ae5e14b309413128245
+  data.tar.gz: eaa69f3edd8eebcce84bd92f2fda7547d7c1b3f041994f9a9a5e7fcf91fcf349e650d25622cc995b36e3f4a8c08fbb4299de7229e8bb5981959f38d707fc4881

data/lib/cocoapods-binary-artifactory-cache/pod-rome/xcodebuild_command.rb

@@ -30,6 +30,7 @@ module PodPrebuild
           collect_output(target, Dir[target_products_dir_of(target, sdks[0]) + "/*"])
         end
       end
+      fix_swiftinterface_files(targets)
     end
 
     private
@@ -99,8 +100,9 @@ module PodPrebuild
       output = "#{output_path(target)}/#{target.product_module_name}.xcframework"
       FileUtils.rm_rf(output)
 
-      cmd = ["xcodebuild", "-create-xcframework", "-allow-internal-distribution"]
-
+      cmd = ["xcodebuild", "-create-xcframework"]
+      # -allow-internal-distribution
+      #
       # for each sdk, the order of params must be -framework then -debug-symbols
       # to prevent duplicated file error when copying dSYMs
       sdks.each do |sdk|
@@ -125,6 +127,24 @@ module PodPrebuild
       `#{cmd.join(" ")}`
     end
 
+    def fix_swiftinterface_files(targets)
+      targets.each do |target|
+        escapedPod = target.product_module_name.gsub('/', '\/')
+        # replace when framework and class in framework with the same name
+        replaceString1 = "-e '/^import/! s/ #{escapedPod}\\./ /g'" #remove framework name in swiftinterface of it frameworkd
+        replaceString2 = "-e 's/\(#{escapedPod}\\./(/g'"
+        replaceString3 = "-e 's/\\[#{escapedPod}\\./[/g'"
+        replaceString4 = "-e 's/<#{escapedPod}\\./</g'"
+        Pod::UI.puts_indented "$ find '#{output_path(target)}/#{target.product_module_name}.xcframework' -name '*.swiftinterface' -exec sed -i -e #{replaceString1} #{replaceString2} #{replaceString3} #{replaceString4} {} \\\;"
+        `find "#{output_path(target)}/#{target.product_module_name}.xcframework" -name '*.swiftinterface' -exec sed -i -e #{replaceString1} #{replaceString2} #{replaceString3} #{replaceString4} {} \\\;`
+      end
+      #remove dublication name in other frameworks
+      allDirTargets = Dir["#{@options[:output_path]}/*"].map { |x| x.gsub("#{@options[:output_path]}/", "") }
+      replaceString = allDirTargets.map { |x| x.product_module_name }.uniq().map{ |x| x.gsub('/', '\/')}.map{|x| "-e 's/#{x}\\.#{x}/#{x}/g'"}.join(' ')
+      Pod::UI.puts_indented "$ find #{@options[:output_path]} -name '*.swiftinterface' -exec sed -i -e #{replaceString} {} \\\;"
+      `find #{@options[:output_path]} -name '*.swiftinterface' -exec sed -i -e #{replaceString} {} \\\;`
+    end
+
     def create_fat_framework(target)
       # When merging contents of `simulator` & `device`, prefer contents of `device` over `simulator`
       # https://github.com/grab/cocoapods-binary-cache/issues/25

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-artifactory-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Eugene Antropov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Reduce build time by building pod frameworks and cache it in artifactory