pod-builder 2.0.0.beta.24 → 2.0.0.beta.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d6868b29d7c33745475969ec3efc788d50e046e4507105a015dd7897eef2a2
-  data.tar.gz: fc638de64c1f6df8946d33a84a3f0dcf82b821c62c0bcc14c98c346f3f07b423
+  metadata.gz: 75b20eb1955937c42e11f9e8e261f40a907a50a7225a6a892915963d82b99317
+  data.tar.gz: 3a2b45e51f95e4573bfc29838181f823fa9c12b754c751cb0506c28c3a09a60c
 SHA512:
-  metadata.gz: 82ffb0bcbd8ea3cbd79a0bb8d0cbcca8d51799ea419c87afdd53e2832b96564f445956adccfcf79ddb1d5f4f88d2cf05a41a7e106c913f9933cf05559aa523e0
-  data.tar.gz: 9b59baa40cd02c07ee6a46e84f1f20becbd4588c4076056ec323e807ddafc0d53d928465a16c98ab91988aff8ea757c8892bce4dd3c184f7022edd72e2d25847
+  metadata.gz: 7ca77c2cce6fdc77c95a6748cbaf1cf08dc6163cf0906ae09a90a05373832d5dc35c4a4b04a57a00776bed873eb5cbee590127749d5d93cd621b85fd88ec5eed
+  data.tar.gz: 22d3bc57f93f27118788ecd95097eaa9d522032e6a19fd5f9ab673834fb2d3655c5f9387b57cbdd01cf77b3d41ad39e59563151e2680cd5bccea938cacb14b42

data/lib/pod_builder/install.rb

@@ -291,7 +291,7 @@ module PodBuilder
         data = {}
         data['entry'] = entry
         data['is_prebuilt'] = podfile_item.is_prebuilt  
-        if Dir.glob(File.join(path, "#{podfile_item.module_name}/Headers/*-Swift.h")).count > 0
+        if Dir.glob(File.join(path, "#{podfile_item.prebuilt_rel_path}/Headers/*-Swift.h")).count > 0
           data['swift_version'] = swift_version
         end
         
@@ -345,8 +345,6 @@ module PodBuilder
           rel_path = path.gsub(rootpath, "")[1..]
           unless exclude_files.include?(rel_path)
             file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
-          else
-            puts path
           end
         end
 

data/lib/pod_builder/podfile.rb

@@ -20,6 +20,7 @@ module PodBuilder
       install_using_frameworks = install_using_frameworks(analyzer)      
 
       podfile.sub!("%%%use_frameworks%%%", install_using_frameworks ? "use_frameworks!" : "") 
+      podfile.sub!("%%%uses_frameworks%%%", install_using_frameworks ? "true" : "false") 
 
       podfile.sub!("%%%platform_name%%%", platform.name.to_s)
       podfile.sub!("%%%deployment_version%%%", platform.deployment_target.version)
@@ -46,7 +47,7 @@ module PodBuilder
 
         # Don't store .pcm info in binary, see https://forums.swift.org/t/swift-behavior-of-gmodules-and-dsyms/23211/3
         build_settings['CLANG_ENABLE_MODULE_DEBUGGING'] = 'NO'
-        build_settings['OTHER_SWIFT_FLAGS'] = "-Xfrontend -no-clang-module-breadcrumbs"
+        build_settings['OTHER_SWIFT_FLAGS'] = "$(inherited) -Xfrontend -no-clang-module-breadcrumbs"
 
         # Improve compile speed
         build_settings['COMPILER_INDEX_STORE_ENABLE'] = 'NO'
@@ -681,7 +682,7 @@ module PodBuilder
     def self.install_using_frameworks(analyzer)
       target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
       if target_settings.count == 1
-        if target_settings.first == false
+        if target_settings.first == false && ENV['DEBUGGING'].nil?
           raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
         end
         return target_settings.first

data/lib/pod_builder/rome/post_install.rb

@@ -4,7 +4,7 @@ require 'fourflusher'
 require 'colored'
 
 module PodBuilder
-  def self.build_for_iosish_platform(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
+  def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
     raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
     
     dsym_device_folder = File.join(build_dir, "dSYM", device)
@@ -18,7 +18,7 @@ module PodBuilder
     xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [])
     excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs)
-    
+
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
     spec_names.each do |root_name, module_name|
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
@@ -76,7 +76,165 @@ module PodBuilder
       FileUtils.rm_rf(simulator_framework_lib)
     end
   end
+
+  def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
+    raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
+
+    device_headers_folder = File.join(build_dir, "Headers", device)
+    simulator_headers_folder = File.join(build_dir, "Headers", simulator)
+    FileUtils.mkdir_p(device_headers_folder)
+    FileUtils.mkdir_p(simulator_headers_folder)
+        
+    deployment_target = target.platform_deployment_target
+    target_label = target.cocoapods_target_label
+
+    spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
+
+    xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [])
+    spec_names.each do |root_name, module_name|
+      headers_private = "#{sandbox.headers_root.to_s}/Private/#{root_name}/#{module_name}"
+      headers_public = "#{sandbox.headers_root.to_s}/Public/#{root_name}/#{module_name}"
   
+      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
+      device_lib = "#{device_base}/lib#{module_name}.a"
+
+      FileUtils.cp headers_private, device_headers_folder
+      FileUtils.cp headers_public, device_headers_folder
+    end
+
+    excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
+    xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs)
+    spec_names.each do |root_name, module_name|
+      headers_private = "#{sandbox.headers_root.to_s}/Private/#{root_name}/#{module_name}"
+      headers_public = "#{sandbox.headers_root.to_s}/Public/#{root_name}/#{module_name}"
+  
+      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
+      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
+
+      FileUtils.cp headers_private, simulator_headers_folder
+      FileUtils.cp headers_public, simulator_headers_folder
+    end
+
+    spec_names.each do |root_name, module_name|
+      device_headers_private = ""
+      device_headers_public = ""
+      simulator_headers_private = ""
+      simulator_headers_public = ""
+
+      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
+      device_lib = "#{device_base}/lib#{module_name}.a"
+      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
+      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
+  
+      next unless File.file?(device_lib) && File.file?(simulator_lib)
+
+            # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
+      # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
+      # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
+      # compile time directives (e.g #if targetEnvironment(simulator))
+      #
+      # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
+      if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
+        `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
+      end
+      
+      raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
+      
+      # Merge swift headers as per Xcode 10.2 release notes
+      if File.exist?(device_swift_header_path) && File.exist?(simulator_swift_header_path)
+        device_content = File.read(device_swift_header_path)
+        simulator_content = File.read(simulator_swift_header_path)
+        merged_content = %{
+          #if TARGET_OS_SIMULATOR
+          #{simulator_content}
+          #else
+          #{device_content}
+          #endif
+        }        
+        File.write(device_swift_header_path, merged_content)
+      end
+
+
+    end
+
+
+
+    spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
+    spec_names.each do |root_name, module_name|
+      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
+      device_lib = "#{device_base}/#{module_name}.framework/#{module_name}"
+      device_dsym = "#{device_base}/#{module_name}.framework.dSYM"
+      device_framework_lib = File.dirname(device_lib)
+      device_swift_header_path = "#{device_framework_lib}/Headers/#{module_name}-Swift.h"
+      
+      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
+      simulator_lib = "#{simulator_base}/#{module_name}.framework/#{module_name}"
+      simulator_dsym = "#{simulator_base}/#{module_name}.framework.dSYM"
+      simulator_framework_lib = File.dirname(simulator_lib)
+      simulator_swift_header_path = "#{simulator_framework_lib}/Headers/#{module_name}-Swift.h"
+      
+      next unless File.file?(device_lib) && File.file?(simulator_lib)
+      
+      # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
+      # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
+      # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
+      # compile time directives (e.g #if targetEnvironment(simulator))
+      #
+      # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
+      if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
+        `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
+      end
+      
+      raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
+      
+      # Merge swift headers as per Xcode 10.2 release notes
+      if File.exist?(device_swift_header_path) && File.exist?(simulator_swift_header_path)
+        device_content = File.read(device_swift_header_path)
+        simulator_content = File.read(simulator_swift_header_path)
+        merged_content = %{
+          #if TARGET_OS_SIMULATOR
+          #{simulator_content}
+          #else
+          #{device_content}
+          #endif
+        }        
+        File.write(device_swift_header_path, merged_content)
+      end
+      
+      # # Merge device framework into simulator framework (so that e.g swift Module folder is merged) 
+      # # letting device framework files overwrite simulator ones
+      # FileUtils.cp_r(File.join(device_framework_lib, "."), simulator_framework_lib) 
+      # source_lib = File.dirname(simulator_framework_lib)
+      
+      # FileUtils.cp_r(source_lib, build_dir)
+      
+      # FileUtils.cp_r(device_dsym, dsym_device_folder) if File.exist?(device_dsym)
+      # FileUtils.cp_r(simulator_dsym, dsym_simulator_folder) if File.exist?(simulator_dsym)
+      
+      # # Remove frameworks leaving dSYMs
+      # FileUtils.rm_rf(device_framework_lib) 
+      # FileUtils.rm_rf(simulator_framework_lib)
+    end
+  end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   def self.xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, configuration, deterministic_build, exclude_archs)
     args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk})
     supported_platforms = { 'iphonesimulator' => 'iOS', 'appletvsimulator' => 'tvOS', 'watchsimulator' => 'watchOS' }
@@ -155,6 +313,7 @@ end
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
   enable_dsym = user_options.fetch('dsym', true)
   configuration = user_options.fetch('configuration', 'Debug')
+  uses_frameworks = user_options.fetch('uses_frameworks', true)
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
@@ -170,14 +329,18 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   build_dir.rmtree if build_dir.directory?
   targets = installer_context.umbrella_targets.select { |t| t.specs.any? }
   targets.each do |target|
-    case target.platform_name
-    when :ios then PodBuilder::build_for_iosish_platform(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when :osx then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when :tvos then PodBuilder::build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when :watchos then PodBuilder::build_for_iosish_platform(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    case [target.platform_name, uses_frameworks]
+    when [:ios, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:osx, true] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:tvos, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:watchos, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:ios, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:osx, false] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
     else raise "\n\nUnknown platform '#{target.platform_name}'".red end
-    end
-    
+    end  
+
     raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
     
     built_count = installer_context.umbrella_targets.map { |t| t.specs.map(&:name) }.flatten.map { |t| t.split("/").first }.uniq.count

data/lib/pod_builder/templates/build_podfile.template

@@ -4,7 +4,7 @@ require 'cfpropertylist'
 
 %%%use_frameworks%%%
 
-plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', pre_compile: Proc.new { |installer|
+plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, pre_compile: Proc.new { |installer|
 
   def set_build_settings(target_name, build_configurations, installer)
     installer.pods_project.targets.each do |target|

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.24"
+  VERSION = "2.0.0.beta.25"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.24
+  version: 2.0.0.beta.25
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler