cocoapods-binary-artifactory-cache 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad656efb61549cc4f65cf109b853007db01c4a2625a7d6ed5fe94902f0a7d4aa
-  data.tar.gz: c971b1d3cefe38ef1c114f66ec3a70a2d95c4e52740b94a54626d3300d62eebb
+  metadata.gz: 5d1634b0e687b99b494362bd28507719a74386d6c8d7706ab6c0b2e41a745fac
+  data.tar.gz: f4077e2f6fc2d9034e6fdb0d489badae12be729ad53424bb77978a60d9bf89d8
 SHA512:
-  metadata.gz: 1a49d25c9b603fb1bcddb5090b09300caa1e81c921c7db76b163ecf662fb8faa884581ea64793ab582c1b47a790509b20e1d9a7859d709ed58fb1ab8220f2f45
-  data.tar.gz: 6b32b0db4b702fe72e3931914d10ec121633f769aa95855afc7e98a6447a9883e5d2c51a541e55b4358f95a41ca9655d782388eec4712ca3c74f30d7e0f14d54
+  metadata.gz: 1ed57ea5c330b425b2673e32a82475a2c580de43a6fe8af0c38961e3f8851ea15a0e5bbbb5cb6eaec227bcd76248bbfe1746c9722233784c4ec97bdc1b5a6a86
+  data.tar.gz: 9d57ddfa6a7557de65d0f41039874057612dd29097c19840883a2670a480d9deb39760f382ce1a0665db6a57de120492e1a1dfd15f6fe5e73dc7fd87dd12528c

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")
@@ -123,6 +126,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,11 +6,17 @@ 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?
             update_cli_config(
-              :artifactory_login => ENV['CI_ARTIFACTORY_LOGIN'],
+              :artifactory_login => ENV['ARTIFACTORY_LOGIN'],
               :artifactory_password => ENV['ARTIFACTORY_PASSWORD']
             )
           else
@@ -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.1
+  version: 0.0.5
 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