cocoapods-binary-matchup 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a162e62ce7fd4234c7adab5f5988acf66b19ca01309faf016c7c881cdc8f7067
-  data.tar.gz: 5c6307fd33caf5ca3c311ec89dbef92ee3cca9d3f39a7fa8d746fcae97a7debd
+  metadata.gz: fece0a9ebc431cab6345ee1f7e5ed505ac49b5326248b3240d98e5620bd2ff1a
+  data.tar.gz: 01aba47a154241f25fc9fb9160b9dfc671b4629976abc1f8062c9f3b962026c6
 SHA512:
-  metadata.gz: 47159e0b7bfa77f8423521d56a4b1a9de6daea071bcc2abf2ab4ef55abea7eaae2de09613c3a32a8e6e16e04f0768df9542568351804973729ddcca5a1413c1a
-  data.tar.gz: 011d0445b238af7b6acc5d1af9bad5a67fe6003b434e26767fbc2fd52f85193dd704faec44f5b47d3856ed8a41d3ad1e60e1124a09da0c0030043a6c6192ed96
+  metadata.gz: e735c25acc5e4eea62085c276e1fa9d47cb37ee1316ccf0a9333c420134e39c03c88315839278d8e859fbdec7dac481201c93138df5accfe415de4aab08436cd
+  data.tar.gz: 9f69eb604b8bd504ae381888754e7e78d4b9bb5e1beda1780cd9136c57ac11ee78d3d654d19c20a69049f110d02e67d9edefdc9845c748db0bd920a01862d1ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-binary-matchup (0.0.8)
+    cocoapods-binary-matchup (0.0.14)
       cocoapods (>= 1.5.0, < 2.0)
       fourflusher (~> 2.0)
       xcpretty (~> 0.3.0)

data/README.md

@@ -30,12 +30,12 @@ Then in the flowing normal install process, we hook the integration functions to
 
 ## Installation
 
-    $ gem install cocoapods-binary
+    $ gem install cocoapods-binary-matchup
 
 ## Usage
 
 ``` ruby
-plugin 'cocoapods-binary'
+plugin 'cocoapods-binary-matchup'
 
 use_frameworks!
 # all_binary!
@@ -45,7 +45,7 @@ target "HP" do
 end
 ```
 
-- Add `plugin 'cocoapods-binary'` in the head of Podfile 
+- Add `plugin 'cocoapods-binary-matchup'` in the head of Podfile 
 - Add `:binary => true` as a option of one specific pod, or add `all_binary!` before all targets, which makes all pods binaries.
 - pod install, and that's all
 
@@ -59,11 +59,22 @@ If your `Pods` folder is excluded from git, you may add `keep_source_code_for_pr
 
 If bitcode is needed, add a `enable_bitcode_for_prebuilt_frameworks!` before all targets in Podfile
 
+if forbidden simulator, add a `simulator_build_disable!` before all targets in Podfile 
+
+if custom main deployment target, add a `min_deployment_target(version)` before all targets in Podfile; e.g: `min_deployment_target(14.0)` 
+
+if custom build configuration is needed, add a `set_custom_xcodebuild_options_for_prebuilt_frameworks` before all targets in Podfile; e.g: 
+set_custom_xcodebuild_options_for_prebuilt_frameworks({
+  :device => "ARCHS=arm64",
+  :simulator => "ARCHS=x86_64",
+  :DEBUG_INFORMATION_FORMAT => "dwarf"
+})
+
 
 #### Known Issues
 
 - doesn't support watchos now
-- dSYM files is missing for dynamic frameworks using this plugin. Walkaround: Don't use this plugin for a release build. Add a if condition with ENV around `plugin 'cocoapods-binary'`
+- dSYM files is missing for dynamic frameworks using this plugin. Walkaround: Don't use this plugin for a release build. Add a if condition with ENV around `plugin 'cocoapods-binary-matchup'`
 
 ## License
 

data/lib/cocoapods-binary-matchup/Integration.rb

@@ -132,6 +132,7 @@ module Pod
                 root_name = spec.root.name
                 
                 target = name_to_target_hash[root_name]
+                # 如果是非源码编译成的pod（如本身是动态库和静态库依赖），则跳过集成，使用pod本身的配置
                 next if Prebuild::Passer.target_names_to_skip_integration_framework.include? target.pod_name
 
                 # use the prebuilt framework

data/lib/cocoapods-binary-matchup/Main.rb

@@ -177,6 +177,7 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :pre_install) do |install
     # install
     Pod::UI.puts "\n"
     Pod::UI.puts "🤖  Pod Install"
+    # 只有进入正常阶段才会执行Integration中的相关hook行为
     require_relative 'Integration'
     # go on the normal install step ...
 end

data/lib/cocoapods-binary-matchup/Prebuild.rb

@@ -127,6 +127,8 @@ module Pod
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
             targets.each do |target|
+                # If target shouldn't build, we copy all the original files
+                # This is for target with only .a and .h files
                 if !target.should_build?
                     UI.puts "Prebuilding #{target.label}"
                     next
@@ -187,6 +189,7 @@ module Pod
                     next
                 end
 
+                # copy the vendored frameworks and libraries in _Prebuild to Pods/
                 target.spec_consumers.each do |consumer|
                     file_accessor = Sandbox::FileAccessor.new(root_path, consumer)
                     lib_paths = file_accessor.vendored_frameworks || []

data/lib/cocoapods-binary-matchup/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
 end

data/lib/cocoapods-binary-matchup/rome/build_framework.rb

@@ -30,12 +30,12 @@ def build_for_iosish_platform(sandbox,
   other_options = []
   # bitcode enabled
   other_options += ['BITCODE_GENERATION_MODE=bitcode'] if bitcode_enabled
-  # make less arch to iphone simulator for faster build
-  custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
 
   is_succeed, _ = xcodebuild(sandbox, target_label, device, deployment_target, other_options + custom_build_options)
   exit 1 unless is_succeed
   if Pod::Podfile::DSL.simulator_build_enabled
+    # make less arch to iphone simulator for faster build
+    custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
     is_succeed, _ = xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + custom_build_options_simulator)
     exit 1 unless is_succeed
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - leavez