cocoapods-binary 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f6d7d397c71e854a7e9d6639fa6ca5db285be1baf54e9af54231badc8f53a9
-  data.tar.gz: a2a2e8bd6c1010f2ef7c2d03ae46d24ba76d1347b30b586d44ddcf5aaba1ac13
+  metadata.gz: 1b94ec6d8eea9b4b28d5dfad282b0e27ee21fa2d187140b0b4396b63fe729366
+  data.tar.gz: f96cfbf68def793a2b3d89ab12e4a04d94d474dca20edea3300c1f242fdfe0c1
 SHA512:
-  metadata.gz: 3db502e1c9655092e9f2b38a129d27ead17e48d2bd9bc9cb1d143de5b85d606d49d3d8783b2147851da2d17dab66b69508cedd8acee2ef61a136b4074c946970
-  data.tar.gz: 21a1c41d15eb85daf2ecd05cce73b990f73f2b0119c4021bcd9b4e7875362d7af8a9804642a11aa5667acf18c8c378b7f02e793ff9799d93a460d64647878bb5
+  metadata.gz: 0d55f919ec0936fa2e22072d174c154b1a11248f70e359833fe279b6a0f7409011e80c83ff90bcf3ea7eca6158c803c6bc74d6d0048d558a45530e80b2e8f145
+  data.tar.gz: 8ecf054e300bd422b80f22424411aa5cb6ad45fdac334b129c8e6b8823feb5bacb7c13c924b96e4e9c199886db138f663851f4fd87b1596045430885246ea018

data/lib/cocoapods-binary/Integration.rb

@@ -49,11 +49,8 @@ module Pod
             changes = Pod::Prebuild.framework_changes
             updated_names = []
             if changes == nil
-                puts "aaaaa"
                 updated_names = PrebuildSandbox.from_standard_sandbox(self.sandbox).exsited_framework_names
             else
-                puts "bbbbb"
-                puts changes
                 added = changes[:added] || []
                 changed = changes[:changed] || []
                 deleted = changes[:removed] || []
@@ -67,6 +64,9 @@ module Pod
                 # delete the cached files
                 target_path = self.sandbox.pod_dir(root_name)
                 target_path.rmtree if target_path.exist?
+
+                support_path = sandbox.target_support_files_dir(root_name)
+                support_path.rmtree if support_path.exist?
             end
 
         end
@@ -76,8 +76,6 @@ module Pod
         old_method2 = instance_method(:resolve_dependencies)
         define_method(:resolve_dependencies) do
 
-            puts "ddddddddd"
-
             # Remove the old target files, else it will not notice file changes
             self.remove_target_files_if_needed
             old_method2.bind(self).()

data/lib/cocoapods-binary/Main.rb

@@ -2,6 +2,24 @@
 
 require_relative 'podfile_options'
 
+module Pod    
+    class Podfile
+        module DSL
+            
+            # enable bitcode for prebuilt frameworks
+            def enable_bitcode_for_prebuilt_frameworks!
+                @@bitcode_enabled = true
+            end
+
+            private
+            @@bitcode_enabled = false
+            def self.is_bitcode_enabled
+                @@bitcode_enabled
+            end
+        end
+    end
+end
+
 Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_context|
     
     require_relative 'feature_switches'

data/lib/cocoapods-binary/Prebuild.rb

@@ -27,7 +27,6 @@ module Pod
             return false if local_manifest == nil
             
             changes = local_manifest.detect_changes_with_podfile(podfile)
-            puts changes
             Pod::Prebuild.framework_changes = changes # save the chagnes info for later stage
             added = changes[:added] || []
             changed = changes[:changed] || []
@@ -60,6 +59,7 @@ module Pod
             local_manifest = self.local_manifest
             sandbox_path = sandbox.root
             existed_framework_folder = sandbox.generate_framework_path
+            bitcode_enabled = Pod::Podfile::DSL.is_bitcode_enabled
 
             if local_manifest != nil
 
@@ -93,10 +93,10 @@ module Pod
                         pod_target.root_spec.name == pod_name
                     end
                 end
-                Pod::Prebuild.build(sandbox_path, existed_framework_folder, targets)
+                Pod::Prebuild.build(sandbox_path, existed_framework_folder, targets, bitcode_enabled)
                 
             else
-                Pod::Prebuild.build(sandbox_path, existed_framework_folder, self.pod_targets)
+                Pod::Prebuild.build(sandbox_path, existed_framework_folder, self.pod_targets, bitcode_enabled)
             end
 
             # Remove useless files

data/lib/cocoapods-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

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

@@ -11,13 +11,18 @@ PLATFORMS = { 'iphonesimulator' => 'iOS',
 #  @param [PodTarget] target
 #         a specific pod target
 #
-def build_for_iosish_platform(sandbox, build_dir, target, device, simulator)
+def build_for_iosish_platform(sandbox, build_dir, target, device, simulator, bitcode_enabled)
   deployment_target = target.platform.deployment_target.to_s
   
   target_label = target.label
   Pod::UI.puts "Prebuilding #{target_label}..."
-  xcodebuild(sandbox, target_label, device, deployment_target)
-  xcodebuild(sandbox, target_label, simulator, deployment_target)
+  
+  other_options = [] 
+  if bitcode_enabled
+    other_options += ['OTHER_CFLAGS="-fembed-bitcode"']
+  end
+  xcodebuild(sandbox, target_label, device, deployment_target, other_options)
+  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'])
 
   root_name = target.pod_name
   module_name = target.product_module_name
@@ -38,10 +43,11 @@ def build_for_iosish_platform(sandbox, build_dir, target, device, simulator)
   FileUtils.rm device_lib if File.file?(device_lib)
 end
 
-def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil)
-  args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk})
+def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_options=[])
+  args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk} )
   platform = PLATFORMS[sdk]
   args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
+  args += other_options
   Pod::Executable.execute_command 'xcodebuild', args, true
 end
 
@@ -61,7 +67,7 @@ module Pod
     #         [Array<PodTarget>] targets
     #         The pod targets to build
     #
-    def self.build(sandbox_root_path, output_path, targets)
+    def self.build(sandbox_root_path, output_path, targets, bitcode_enabled = false)
     
       return unless not targets.empty?
     
@@ -78,7 +84,7 @@ module Pod
     
       targets.each do |target|
         case target.platform.name
-        when :ios then build_for_iosish_platform(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator')
+        when :ios then build_for_iosish_platform(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', bitcode_enabled)
         when :osx then xcodebuild(sandbox, target.label)
         when :tvos then nil
         when :watchos then nil

data/lib/cocoapods-binary/tool/tool.rb

@@ -9,28 +9,4 @@
 #
 def class_attr_accessor(symbol)
     self.class.send(:attr_accessor, symbol)
-end
-
-
-
-class Object
-    def deep_clone
-      return @deep_cloning_obj if @deep_cloning
-      @deep_cloning_obj = clone
-      @deep_cloning_obj.instance_variables.each do |var|
-        val = @deep_cloning_obj.instance_variable_get(var)
-        begin
-          @deep_cloning = true
-          val = val.deep_clone
-        rescue TypeError
-          next
-        ensure
-          @deep_cloning = false
-        end
-        @deep_cloning_obj.instance_variable_set(var, val)
-      end
-      deep_cloning_obj = @deep_cloning_obj
-      @deep_cloning_obj = nil
-      deep_cloning_obj
-    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods