pod-builder 2.0.0.beta.21 → 2.0.0.beta.26

data/lib/pod_builder/podfile.rb

@@ -17,8 +17,10 @@ module PodBuilder
 
       platform = analyzer.instance_variable_get("@result").targets.first.platform
 
-      install_using_frameworks = analyzer.podfile.root_target_definitions.map(&:uses_frameworks?).uniq.first
+      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)
@@ -45,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'
@@ -180,7 +182,7 @@ module PodBuilder
           next
         end
 
-        if pod_name = pod_definition_in(line, true)          
+        if pod_name = pod_definition_in(line, true)      
           if podfile_item = all_buildable_items.detect { |x| x.name == pod_name }
             marker = podfile_item.prebuilt_marker()
 
@@ -198,7 +200,7 @@ module PodBuilder
               dep_item = all_buildable_items.detect { |x| x.name == dep.name }
 
               if File.exist?(dep_item.prebuilt_podspec_path) && !dep_item.is_prebuilt 
-                pod_name = dep_item.prebuilt_entry(false)
+                pod_name = dep_item.prebuilt_entry(false, false)
                 prebuilt_lines.push("#{line.detect_indentation}#{pod_name}#{marker}\n")
               end
 
@@ -591,7 +593,7 @@ module PodBuilder
       base = File.expand_path(File.join(PodBuilder::project_path, ".."))
       bin_js = Dir.glob("#{base}/node_modules/@react-native-community/cli/build/bin.js")
 
-      raise "\n\nReact native cli bin_js not found!".red unless bin_js.count == 1
+      raise "\n\nReact native cli bin_js not found! Did you run yarn install?".red unless bin_js.count == 1
       bin_js = bin_js.first
 
       config_dest_path = PodBuilder::basepath("rn_config.json")
@@ -676,5 +678,21 @@ module PodBuilder
 
       return podfile_content
     end
+
+    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 && 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
+      elsif target_settings.count > 1
+        raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)".red
+      else
+        raise "\n\nFailed detecting use_frameworks!"
+      end
+
+      return true
+    end
   end
 end

data/lib/pod_builder/podfile_cp.rb

@@ -49,7 +49,7 @@ module Pod
         pod_entries = pod_entries.uniq.sort_by { |t| t.name }
 
         prebuild_entries.each do |pod|
-          target_s += "#{child_indentation}#{pod.prebuilt_entry(false)}\n"
+          target_s += "#{child_indentation}#{pod.prebuilt_entry(false, false)}\n"
         end
         pod_entries.each do |pod|
           target_s += "#{child_indentation}#{pod.entry(true, false)}\n"

data/lib/pod_builder/podfile_item.rb

@@ -401,7 +401,7 @@ module PodBuilder
       if absolute_path 
         return podspec_path
       else
-        pod_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+        pod_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::basepath)).to_s
       end
     end
 

data/lib/pod_builder/rome/post_install.rb

@@ -2,9 +2,10 @@
 
 require 'fourflusher'
 require 'colored'
+require 'pathname'
 
 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 +19,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 +77,173 @@ 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_path = File.join(build_dir, "Headers", device)
+    simulator_headers_path = File.join(build_dir, "Headers", simulator)
+    FileUtils.mkdir_p(device_headers_path)
+    FileUtils.mkdir_p(simulator_headers_path)
+        
+    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_path = "#{sandbox.headers_root.to_s}/Public/#{root_name}"
+      dest_path = "#{device_headers_path}/#{root_name}"
+      FileUtils.mkdir_p(dest_path)
+
+      Dir.glob("#{headers_path}/*") do |path|
+        real_path = Pathname.new(path).realpath
+        FileUtils.cp_r(real_path, dest_path)
+      end
+    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_path = "#{sandbox.headers_root.to_s}/Public/#{root_name}"
+      dest_path = "#{simulator_headers_path}/#{root_name}"
+      FileUtils.mkdir_p(dest_path)
+      
+      Dir.glob("#{headers_path}/*") do |path|
+        real_path = Pathname.new(path).realpath
+        FileUtils.cp_r(real_path, dest_path)
+      end
+    end
+
+    spec_names.each do |root_name, module_name|
+      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
+      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
+
+      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
+      device_lib = "#{device_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}")
+
+      device_headers = Dir.glob("#{device_headers_path}/**/*.h")
+      simulator_headers = Dir.glob("#{simulator_headers_path}/**/*.h")
+      device_headers.each do |device_path|
+        simulator_path = device_path.gsub(device_headers_path, simulator_headers_path)
+        if File.exist?(simulator_path)
+          device_content = File.read(device_path)
+          simulator_content = File.read(simulator_path)
+          merged_content = %{
+            #if TARGET_OS_SIMULATOR
+            #{simulator_content}
+            #else
+            #{device_content}
+            #endif
+          }        
+          File.write(device_path, merged_content)
+        end
+      end
+      simulator_only_headers = simulator_headers - device_headers.map { |t| t.gsub(device_headers_path, simulator_headers_path) }
+      simulator_only_headers.each do |path|
+        simulator_content = File.read(path)
+        content = %{
+          #if TARGET_OS_SIMULATOR
+          #{simulator_content}
+          #endif
+        }        
+        File.write(path, 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' }
@@ -148,13 +315,12 @@ module PodBuilder
     end
     project.save
   end
-
-  
 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 +336,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
@@ -226,7 +396,10 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     end
     
     if enable_dsym
-      FileUtils.mv("#{build_dir}/dSYM", sandbox_root.parent)
+      dsym_source = "#{build_dir}/dSYM"
+      if File.directory?(dsym_source)
+        FileUtils.mv(dsym_source, sandbox_root.parent)
+      end
     else
       raise "Not implemented"
     end

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.21"
+  VERSION = "2.0.0.beta.26"
 end
   

data/pod-builder.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "pod-builder"
   spec.version       = PodBuilder::VERSION
   spec.authors       = ["Tomas Camin"]
-  spec.email         = ["tomas.camin@schibsted.com"]
+  spec.email         = ["tomas.camin@adevinta.com"]
 
   spec.summary       = %q{Prebuild CocoaPods pods}
   spec.description   = %q{Prebuild CocoaPods pods to make compiling your Xcode projects faster}
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|Example)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.21
+  version: 2.0.0.beta.26
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,35 +166,13 @@ dependencies:
         version: '0'
 description: Prebuild CocoaPods pods to make compiling your Xcode projects faster
 email:
-- tomas.camin@schibsted.com
+- tomas.camin@adevinta.com
 executables:
 - pod_builder
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Example/PodBuilder/.gitignore
-- Example/PodBuilder/.pod_builder/pod_builder
-- Example/PodBuilder/PodBuilder.json
-- Example/PodBuilder/Podfile
-- Example/PodBuilder/Podfile.restore
-- Example/PodBuilderExample.xcodeproj/project.pbxproj
-- Example/PodBuilderExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-- Example/PodBuilderExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-- Example/PodBuilderExample.xcodeproj/project.xcworkspace/xcuserdata/tomas.xcuserdatad/UserInterfaceState.xcuserstate
-- Example/PodBuilderExample.xcworkspace/contents.xcworkspacedata
-- Example/PodBuilderExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-- Example/PodBuilderExample/AppDelegate.swift
-- Example/PodBuilderExample/Assets.xcassets/AppIcon.appiconset/Contents.json
-- Example/PodBuilderExample/Assets.xcassets/Contents.json
-- Example/PodBuilderExample/Base.lproj/LaunchScreen.storyboard
-- Example/PodBuilderExample/Base.lproj/Main.storyboard
-- Example/PodBuilderExample/Info.plist
-- Example/PodBuilderExample/ViewController.swift
-- Example/Podfile
-- Example/Podfile.lock
-- Example/Pods-acknowledgements.md
-- Example/Pods-acknowledgements.plist
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -209,9 +187,8 @@ files:
 - lib/pod_builder/command/build.rb
 - lib/pod_builder/command/build_all.rb
 - lib/pod_builder/command/clean.rb
-- lib/pod_builder/command/clear_lldbinit.rb
 - lib/pod_builder/command/deintegrate.rb
-- lib/pod_builder/command/generate_lfs.rb
+- lib/pod_builder/command/generate_lldbinit.rb
 - lib/pod_builder/command/generate_podspec.rb
 - lib/pod_builder/command/info.rb
 - lib/pod_builder/command/init.rb
@@ -221,7 +198,6 @@ files:
 - lib/pod_builder/command/switch.rb
 - lib/pod_builder/command/sync_podfile.rb
 - lib/pod_builder/command/update.rb
-- lib/pod_builder/command/update_lldbinit.rb
 - lib/pod_builder/configuration.rb
 - lib/pod_builder/core.rb
 - lib/pod_builder/info.rb

data/Example/PodBuilder/.gitignore

@@ -1,6 +0,0 @@
-Pods/
-*.xcworkspace
-*.xcodeproj
-Podfile.lock
-Sources
-PodBuilderDevPodsPaths.json