cocoapods-binary-artifactory-cache 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4de1125d0101423f9584e1d7b943bb7608707d184d17969e6b4fad8d19f7ed2
-  data.tar.gz: aa9eb1829465d0968994e50d1ce7152e26e2c738fa12fc0bfc73330a8faad649
+  metadata.gz: b4cfc2fff39aee0f9265546c438f2aa6126ef39bfa1f1f0efe79306a8d62246a
+  data.tar.gz: 4b3da62440e42f152100015119aa58f0298f359783ad909a4c754ef1380c84ff
 SHA512:
-  metadata.gz: bc15343f0371dd62c865ab8196e262f21b16b8d1224d6334451f42717fd99c492dbadb743d9b03d499d45e64ca29e64f769303460dd889499156d9f125337141
-  data.tar.gz: 12c4c55e05d09df5670fac9b15ac0739f2c9689226060ca969b187f78e50faa0621314bac9a6a80507e28aa040344fc45fa68d93b863e54d771dfb4046a01d1e
+  metadata.gz: 23da6af76fe38360a654ca34afc3041cd07f777f0d28b36b0d29c6ca1f2406bdb80ce9a3154ea0a5745c7a28bf16c2208894b98d4386c153cc3a226c465edf11
+  data.tar.gz: ddab146341a0502353fbcf091ae21ea102458a6df055a8812499e53e12fe73d2376b15926a2bcbd34e23dccd7972347c7a4db4826ff2e95edc350462a8c59fcf

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
@@ -66,7 +67,9 @@ module PodPrebuild
       args_[:simulator] ||= []
       args_[:device] ||= []
       args_[:default].prepend("BITCODE_GENERATION_MODE=bitcode") if bitcode_enabled?
+      args_[:default].prepend("DEBUG_INFORMATION_FORMAT=dwarf-with-dsym") unless disable_dsym?
       args_[:default].prepend("DEBUG_INFORMATION_FORMAT=dwarf") if disable_dsym?
+      args_[:default].prepend("BUILD_LIBRARY_FOR_DISTRIBUTION=YES")
       args_[:simulator].prepend("ARCHS=x86_64", "ONLY_ACTIVE_ARCH=NO") if simulator == "iphonesimulator"
       args_[:simulator] += args_[:default]
       args_[:device].prepend("ONLY_ACTIVE_ARCH=NO")
@@ -97,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|
@@ -123,6 +127,21 @@ 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'"
+        `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
+      replaceString = targets.map { |x| x.product_module_name }.uniq().map{ |x| x.gsub('/', '\/')}.map{|x| "-e 's/#{x}\\.#{x}/#{x}/g'"}.join(' ')
+      `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

data/lib/command/executor/fetcher.rb

@@ -9,6 +9,7 @@ module PodPrebuild
 
     def initialize(options)
       super(options)
+      @repo_update = options[:repo_update]
     end
 
     def run
@@ -20,7 +21,7 @@ module PodPrebuild
           lockfile: installer.lockfile,
           cache_validation: nil
         )
-
+        @binary_installer.repo_update = @repo_update
         Pod::UI.title("Generate Manifest") do
           @binary_installer.clean_delta_file
           @binary_installer.install!

data/lib/command/fetch.rb

@@ -6,6 +6,12 @@ module Pod
     class Binary < Command
       class Fetch < Binary
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
+        def self.options
+          [
+            ["--repo-update", "Update pod repo before installing"]
+          ].concat(super)
+        end
+
         def initialize(argv)
           super
           unless ENV['ARTIFACTORY_LOGIN'].nil? && ENV['ARTIFACTORY_PASSWORD'].nil?
@@ -28,6 +34,7 @@ module Pod
           )
           @fetcher = PodPrebuild::CacheFetcher.new(
             config: prebuild_config,
+            repo_update: argv.flag?("repo-update")
           )
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-artifactory-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Eugene Antropov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-19 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