cocoapods-binary 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b06937c124b45ca9bdd9c343d3a5a095dbeca45812129bc6df581d1af9e44a9
-  data.tar.gz: bee354ccb5c8519da830b0bf74fc2975db7df7cbad38ebff01f2a15eadc35dd1
+  metadata.gz: c8b8187b94eb261901bdf3928c51898d18cf5311b4982df4b8f32f3f55503979
+  data.tar.gz: 0d7c322deb6c7d748d4baa1984bc35998667223a1bb01551384de1e66f1e8d99
 SHA512:
-  metadata.gz: f5e0abb86ec640703f922a5898f546876321d031e4dd02567a5890d2b6714ed4791d04915e8e3eb4e8ed25ada5ea9fcbdfd38fec7b3ccbd9465c8af437075c9f
-  data.tar.gz: 17717118fdc62c3e8e602ef45fbd9e190e91cb751ada20cb51d67dbe74a2a40150aae45bfa72ede45a19733db61e1b28852644161000f2d0c3a2a061684fd897
+  metadata.gz: 389815bb325e9d6552d47d719e371e5da8aa87d461dd43c5044cfa42e9d948539beeb4e422f7d87550448b99a4731fa7807586f683846b6036fa716f477cbca5
+  data.tar.gz: 6516ee84a6669411f0f2351afed475959249b76c82fb5718b90d74d441801980cd60b5c9b42de693f35ab3e857558efed7cb6ae74e7065b44b7be4293a2ee09e

data/lib/cocoapods-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
 end

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

@@ -29,24 +29,34 @@ def build_for_iosish_platform(sandbox,
   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'])
 
+  # paths
   root_name = target.pod_name
   module_name = target.product_module_name
-  
-  executable_path = "#{build_dir}/#{root_name}"
-  device_lib = "#{build_dir}/#{CONFIGURATION}-#{device}/#{root_name}/#{module_name}.framework/#{module_name}"
-  device_framework_lib = File.dirname(device_lib)
-  simulator_lib = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{root_name}/#{module_name}.framework/#{module_name}"
-
-  return unless File.file?(device_lib) && File.file?(simulator_lib)
+  device_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{device}/#{root_name}/#{module_name}.framework"
+  simulator_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{root_name}/#{module_name}.framework"
 
-  lipo_log = `lipo -create -output #{executable_path} #{device_lib} #{simulator_lib}`
-  puts lipo_log unless File.exist?(executable_path)
+  device_binary = device_framwork_path + "/#{module_name}"
+  simulator_binary = simulator_framwork_path + "/#{module_name}"
+  return unless File.file?(device_binary) && File.file?(simulator_binary)
+  
+  # the device_lib path is the final output file path
+  # combine the bianries
+  tmp_lipoed_binary_path = "#{build_dir}/#{root_name}"
+  lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
+  puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
+  FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true
+  
+  # collect the swiftmodule file for various archs.
+  device_swiftmodule_path = device_framwork_path + "/Modules/#{module_name}.swiftmodule"
+  simulator_swiftmodule_path = simulator_framwork_path + "/Modules/#{module_name}.swiftmodule"
+  if File.exist?(device_swiftmodule_path)
+    FileUtils.cp_r simulator_swiftmodule_path + "/.", device_swiftmodule_path
+  end
 
-  FileUtils.mv executable_path, device_lib, :force => true
+  # output
   output_path.mkpath unless output_path.exist?
-  FileUtils.mv device_framework_lib, output_path, :force => true
-  FileUtils.rm simulator_lib if File.file?(simulator_lib)
-  FileUtils.rm device_lib if File.file?(device_lib)
+  FileUtils.mv device_framwork_path, output_path, :force => true
+
 end
 
 def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_options=[])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods