cocoapods-binary-cache 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0baf85dbe90fee58da87dd415914283de859c15267e14c7562cdc631a52c74f2
-  data.tar.gz: ffa3a8be9fe5cc5c55c502e8eb98a9963f04cb0f9076b67ed74af3f7f50d4c2e
+  metadata.gz: 116f1017bbeca303037ea4873ed6f6ec0b6ae8e9d976958f5f2b95109c50b252
+  data.tar.gz: 0dd220d2c51ddaa367cf7cca6b68f23f4c898fbbeddc53d025ab39ab67b2a9d6
 SHA512:
-  metadata.gz: 971f985d73911276ff9dd46bc963bc67e9ffaf70f367d9398eb2573c16ef9b6f5a5d031d51bc480b044e6d3d881052a4a9a03a89f7beddc5dc1d08a58c837603
-  data.tar.gz: 3d8f0429cb6b06e44b7231b6c484e617ff659d97685b162f4fa44d7101f8378bd5d5500b9812da3fb0e156be190ee7dc6c50b8368aa9ef3e54b68a9f7893021f
+  metadata.gz: 1120f16b6bba0bb97db8d61d0799aebc3a395e94d6c1a0a273fe0c2d3ba9b3ffa3bd3c573ef36c7697457fc10d3546d1c92a130c8b8a4cd64b66004f3a798b50
+  data.tar.gz: 0efa97b49bdc34edf8ce4ebf8762b90114a2443bce9873fbb64482d0d6ab2a6e85d68c2d48904bd391d9d2d52566850abba4b7f7d6bf1f852c41e9fb3d389054

data/lib/cocoapods-binary-cache/pod-binary/integration/alter_specs.rb

@@ -4,26 +4,43 @@ module Pod
       cache = []
       analysis_result.specifications
         .select { |spec| should_integrate_prebuilt_pod?(spec.root.name) }
-        .each { |spec| alter_spec(spec, cache) }
+        .group_by(&:root)
+        .each do |_, specs|
+          first_subspec_or_self = specs.find(&:subspec?) || specs[0]
+          specs.each do |spec|
+            alterations = {
+              :source_files => true,
+              :resources => true,
+              :license => true,
+              :vendored_framework => spec == first_subspec_or_self
+            }
+            alter_spec(spec, alterations, cache)
+          end
+        end
     end
 
-    def alter_spec(spec, cache)
+    private
+
+    def alter_spec(spec, alterations, cache)
       targets = Pod.fast_get_targets_for_pod_name(spec.root.name, pod_targets, cache)
-      targets.each do |target|
-        # Use the prebuild framworks as vendered frameworks.
-        # The framework_file_path rule is decided in `install_for_prebuild`,
-        # as to compitable with older version and be less wordy.
-        framework_file_path = target.framework_name
-        framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
-        framework_file_path = PodPrebuild.config.prebuilt_path(path: framework_file_path)
-        add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+      platforms = targets.map { |target| target.platform.name.to_s }.uniq
+
+      if alterations[:vendored_framework]
+        targets.each do |target|
+          # Use the prebuilt frameworks as vendered frameworks.
+          # The framework_file_path rule is decided in `install_for_prebuild`,
+          # as to compitable with older version and be less wordy.
+          framework_file_path = target.framework_name
+          framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
+          framework_file_path = PodPrebuild.config.prebuilt_path(path: framework_file_path)
+          add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+        end
       end
 
-      platforms = targets.map { |target| target.platform.name.to_s }.uniq
-      empty_source_files(spec, platforms)
-      tweak_resources_for_xib(spec, platforms)
-      tweak_resources_for_resource_bundles(spec, platforms)
-      empty_liscence(spec) # to avoid the warning of missing license
+      empty_source_files(spec, platforms) if alterations[:source_files]
+      tweak_resources_for_xib(spec, platforms) if alterations[:resources]
+      tweak_resources_for_resource_bundles(spec, platforms) if alterations[:resources]
+      empty_liscence(spec) if alterations[:license]
     end
 
     def tweak_resources_for_xib(spec, platforms)

data/lib/cocoapods-binary-cache/pod-binary/integration/source_installer.rb

@@ -11,7 +11,7 @@ module Pod
       end
 
       def install!
-        @source_installer.install! if PodPrebuild.config.still_download_sources?(name)
+        @source_installer.install!
         install_prebuilt_framework!
       end
 
@@ -39,8 +39,10 @@ module Pod
           walk(real_file_folder) do |child|
             source = child
             # only make symlink to file and `.framework` folder
-            if child.directory? && [".framework", ".dSYM"].include?(child.extname)
-              mirror_with_symlink(source, real_file_folder, target_folder) if child.extname == ".framework"
+            if child.directory? && [".framework", ".xcframework", ".dSYM"].include?(child.extname)
+              if [".framework", ".xcframework"].include?(child.extname)
+                mirror_with_symlink(source, real_file_folder, target_folder)
+              end
               # Ignore dsym here to avoid cocoapods from adding install_dsym to buildphase-script
               # That can cause duplicated output files error in Xcode 11 (warning in Xcode 10)
               # We need more setup to support local debuging with prebuilt dSYM
@@ -58,10 +60,15 @@ module Pod
           next unless metadata.static_framework?
 
           metadata.resources.each do |path|
-            target_file_path = path
+            target_file_path = Pathname(path)
               .sub("${PODS_ROOT}", sandbox.root.to_path)
               .sub("${PODS_CONFIGURATION_BUILD_DIR}", sandbox.root.to_path)
+            next if target_file_path.exist?
+
             real_file_path = real_file_folder + metadata.framework_name + File.basename(path)
+
+            # TODO (thuyen): Fix https://github.com/grab/cocoapods-binary-cache/issues/45
+
             case File.extname(path)
             when ".xib"
               # https://github.com/grab/cocoapods-binary-cache/issues/7

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

@@ -19,26 +19,30 @@ module PodPrebuild
     end
 
     def run
-      build_for_sdk(simulator) if build_types.include?(:simulator)
-      build_for_sdk(device) if build_types.include?(:device)
+      sdks.each { |sdk| build_for_sdk(sdk) }
 
       targets.each do |target|
-        case build_types
-        when [:simulator]
-          collect_output(target, Dir[target_products_dir_of(target, simulator) + "/*"])
-        when [:device]
-          collect_output(target, Dir[target_products_dir_of(target, device) + "/*"])
+        if PodPrebuild.config.xcframework?
+          create_xcframework(target)
+        elsif sdks.count > 1
+          create_fat_framework(target)
         else
-          # When merging contents of `simulator` & `device`, prefer contents of `device` over `simulator`
-          # https://github.com/grab/cocoapods-binary-cache/issues/25
-          collect_output(target, Dir[target_products_dir_of(target, device) + "/*"])
-          create_universal_framework(target)
+          collect_output(target, Dir[target_products_dir_of(target, sdks[0]) + "/*"])
         end
       end
     end
 
     private
 
+    def sdks
+      @sdks ||= begin
+        sdks_ = []
+        sdks_ << simulator if build_types.include?(:simulator)
+        sdks_ << device if build_types.include?(:device)
+        sdks_
+      end
+    end
+
     def build_types
       @build_types ||= begin
         # TODO (thuyen): Add DSL options `build_for_types` to specify build types
@@ -49,15 +53,19 @@ module PodPrebuild
     end
 
     def make_up_build_args(args)
+      # Note: The build arguments explicitly passed from config_cocoapods_binary_cache
+      # should be preceded by the default arguments so that they could take higher priority
+      # when there are argument collisions in the xcodebuild command.
+      # For ex. `xcodebuild AN_ARG=1 AN_ARG=2` should use `AN_ARG=2` instead.
       args_ = args.clone
       args_[:default] ||= []
       args_[:simulator] ||= []
       args_[:device] ||= []
-      args_[:default] += ["BITCODE_GENERATION_MODE=bitcode"] if bitcode_enabled?
-      args_[:default] += ["DEBUG_INFORMATION_FORMAT=dwarf"] if disable_dsym?
-      args_[:simulator] += ["ARCHS=x86_64", "ONLY_ACTIVE_ARCH=NO"] if simulator == "iphonesimulator"
+      args_[:default].prepend("BITCODE_GENERATION_MODE=bitcode") if bitcode_enabled?
+      args_[:default].prepend("DEBUG_INFORMATION_FORMAT=dwarf") if disable_dsym?
+      args_[:simulator].prepend("ARCHS=x86_64", "ONLY_ACTIVE_ARCH=NO") if simulator == "iphonesimulator"
       args_[:simulator] += args_[:default]
-      args_[:device] += ["ONLY_ACTIVE_ARCH=NO"]
+      args_[:device].prepend("ONLY_ACTIVE_ARCH=NO")
       args_[:device] += args_[:default]
       args_
     end
@@ -74,7 +82,47 @@ module PodPrebuild
       )
     end
 
-    def create_universal_framework(target)
+    def create_xcframework(target)
+      non_framework_paths = Dir[target_products_dir_of(target, sdks[0]) + "/*"] \
+        - [framework_path_of(target, sdks[0])] \
+        - dsym_paths_of(target, sdks[0]) \
+        - bcsymbolmap_paths_of(target, sdks[0])
+      collect_output(target, non_framework_paths)
+
+      output = "#{output_path(target)}/#{target.product_module_name}.xcframework"
+      FileUtils.rm_rf(output)
+
+      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|
+        cmd << "-framework" << framework_path_of(target, sdk)
+
+        unless disable_dsym?
+          dsyms = dsym_paths_of(target, sdk)
+          cmd += dsyms.map { |dsym| "-debug-symbols #{dsym}" }
+        end
+
+        if bitcode_enabled?
+          bcsymbolmaps = bcsymbolmap_paths_of(target, sdk)
+          cmd += bcsymbolmaps.map { |bcsymbolmap| "-debug-symbols #{bcsymbolmap}" }
+        end
+      end
+
+      cmd << "-output" << output
+
+      Pod::UI.puts "- Create xcframework: #{target}".magenta
+      Pod::UI.puts_indented "$ #{cmd.join(' ')}" unless PodPrebuild.config.silent_build?
+
+      `#{cmd.join(" ")}`
+    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
+      collect_output(target, Dir[target_products_dir_of(target, device) + "/*"])
+
       merge_framework_binary(target)
       merge_framework_dsym(target)
       merge_swift_headers(target)
@@ -149,6 +197,14 @@ module PodPrebuild
       "#{target_products_dir_of(target, sdk)}/#{target.product_module_name}.framework"
     end
 
+    def dsym_paths_of(target, sdk)
+      Dir["#{target_products_dir_of(target, sdk)}/*.dSYM"]
+    end
+
+    def bcsymbolmap_paths_of(target, sdk)
+      Dir["#{target_products_dir_of(target, sdk)}/*.bcsymbolmap"]
+    end
+
     def sandbox
       @options[:sandbox]
     end

data/lib/cocoapods-binary-cache/pod-rome/xcodebuild_raw.rb

@@ -8,6 +8,11 @@ module PodPrebuild
       "watchsimulator" => "watchOS"
     }.freeze
 
+    DESTINATION_OF_SDK = {
+      "iphoneos" => "\"generic/platform=iOS\"",
+      "iphonesimulator" => "\"generic/platform=iOS Simulator\""
+    }.freeze
+
     def self.xcodebuild(options)
       sdk = options[:sdk] || "iphonesimulator"
       targets = options[:targets] || [options[:target]]
@@ -18,15 +23,18 @@ module PodPrebuild
       targets.each { |target| cmd << "-target" << target }
       cmd << "-configuration" << options[:configuration]
       cmd << "-sdk" << sdk
-      unless platform.nil?
-        cmd << Fourflusher::SimControl.new.destination(:oldest, platform, options[:deployment_target])
+      if DESTINATION_OF_SDK.key?(sdk)
+        cmd << "-destination" << DESTINATION_OF_SDK[sdk]
+      else
+        cmd << Fourflusher::SimControl.new.destination(:oldest, platform, options[:deployment_target]) unless platform.nil?
       end
       cmd += options[:args] if options[:args]
       cmd << "build"
       cmd << "2>&1"
       cmd = cmd.join(" ")
 
-      Pod::UI.puts_indented "$ #{cmd}"
+      Pod::UI.puts_indented "$ #{cmd}" unless PodPrebuild.config.silent_build?
+
       log = `#{cmd}`
       return if $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
 

data/lib/command/config.rb

@@ -58,7 +58,9 @@ module PodPrebuild
     end
 
     def prebuilt_path(path: nil)
-      path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}"
+      p = Pathname.new(path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}")
+      p = p.sub_ext(".xcframework") if xcframework? && p.extname == ".framework"
+      p.to_s
     end
 
     def validate_dsl_config
@@ -103,13 +105,12 @@ module PodPrebuild
       @dsl_config[:device_build_enabled]
     end
 
-    def disable_dsym?
-      @dsl_config[:disable_dsym]
+    def xcframework?
+      @dsl_config[:xcframework]
     end
 
-    def still_download_sources?(name)
-      option = @dsl_config[:still_download_sources]
-      option.is_a?(Array) ? option.include?(name) : option
+    def disable_dsym?
+      @dsl_config[:disable_dsym]
     end
 
     def dont_remove_source_code?
@@ -136,6 +137,10 @@ module PodPrebuild
       @dsl_config[:strict_diagnosis]
     end
 
+    def silent_build?
+      @dsl_config[:silent_build]
+    end
+
     def targets_to_prebuild_from_cli
       @cli_config[:prebuild_targets] || []
     end
@@ -170,14 +175,15 @@ module PodPrebuild
         :dev_pods_enabled,
         :bitcode_enabled,
         :device_build_enabled,
+        :xcframework,
         :disable_dsym,
-        :still_download_sources,
         :dont_remove_source_code,
         :build_args,
         :save_cache_validation_to,
         :validate_prebuilt_settings,
         :prebuild_code_gen,
-        :strict_diagnosis
+        :strict_diagnosis,
+        :silent_build
       ]
     end
 

data/lib/command/executor/fetcher.rb

@@ -1,3 +1,4 @@
+require "parallel"
 require_relative "base"
 require_relative "../helper/zip"
 
@@ -57,7 +58,8 @@ module PodPrebuild
           @config.manifest_path
         )
       end
-      Dir[@config.generated_frameworks_dir(in_cache: true) + "/*.zip"].each do |path|
+      zip_paths = Dir[@config.generated_frameworks_dir(in_cache: true) + "/*.zip"]
+      Parallel.each(zip_paths, in_threads: 8) do |path|
         ZipUtils.unzip(path, to_dir: @config.generated_frameworks_dir)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement