pod-builder 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81ee77b8206a7bda4fb55dd0fe30d3702aa1c9baad18017177b7c05d87ef1ea9
-  data.tar.gz: 12d28eb2a3b4329a2242bcf0477742178998209f895392ac8e4c6e4bdf234b9c
+  metadata.gz: 6ffc11e0c2a085b295c06e71951ba737c6143103fdb77441d5c9e7abb71d04df
+  data.tar.gz: bc96bf60f8890a3a7737ce6632575a34fc8d28ec4de08465efa65d2a9a8805a1
 SHA512:
-  metadata.gz: 0bd009a46f76cff1a1423b5131e187c22d5cbfd34d0c1c2475f6ce172862ddd3044853e3a7dd1428e7daeb7bcc21cea81d1b449988f0ee34cba3cae6d6cae541
-  data.tar.gz: b11f54906c2c800623f48775a646cf6a1e8f01faf1ffeeceb64df503785035f67d86b63725413f4feca732d3ddd486e53312e29b5aad58f90428b24d79335128
+  metadata.gz: '008bbc4406aaef09090a52073aa9fc5d892112b830964da0830d356423fbee898ae5d663f7c1845ffe918b2a6e9c35e718428d78aaeb53d29a1918b77b9891b4'
+  data.tar.gz: a16426dfc2fa06a58f61dec05ef37a2ca3a6817e5e5a0307bb9e1f6d20fb5f424563dd4a480cf2cee5a288d1c2dba587571a0e0093296f8777332cedce792575

data/lib/pod_builder/command/build.rb

@@ -79,16 +79,17 @@ module PodBuilder
           end  
         end
         
+        build_catalyst = should_build_catalyst(installer)
+
         install_result = InstallResult.new
         podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
           build_configuration = podfile_items.map(&:build_configuration).uniq.first
           
           podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
-          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, Configuration.build_xcframeworks)
+          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, Configuration.build_xcframeworks)
           
           install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
           
-          # remove lockfile which gets unexplicably created
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
@@ -124,6 +125,15 @@ module PodBuilder
 
       private
 
+      def self.should_build_catalyst(installer)
+        build_settings = installer.analysis_result.targets.map { |t| t.user_project.root_object.targets.map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } } }.flatten
+        build_catalyst = build_settings.detect { |t| t["SUPPORTS_MACCATALYST"] == "YES" } != nil 
+        
+        puts "\nTo support Catalyst you should enable 'build_xcframeworks' in PodBuilder.json\n".red unless Configuration.build_xcframeworks
+
+        return build_catalyst
+      end
+
       def self.prepare_defines_modules_override(all_buildable_items)
         all_buildable_items.each do |item|
           unless item.defines_module.nil?

data/lib/pod_builder/podfile.rb

@@ -5,7 +5,7 @@ module PodBuilder
     
     PRE_INSTALL_ACTIONS = ["Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}", "require 'pod_builder/podfile/pre_actions_swizzles'"].freeze
 
-    def self.from_podfile_items(items, analyzer, build_configuration, install_using_frameworks, build_xcframeworks)
+    def self.from_podfile_items(items, analyzer, build_configuration, install_using_frameworks, build_catalyst, build_xcframeworks)
       raise "\n\nno items".red unless items.count > 0
 
       sources = analyzer.sources
@@ -18,7 +18,8 @@ module PodBuilder
       podfile.sub!("%%%use_frameworks%%%", install_using_frameworks ? "use_frameworks!" : "use_modular_headers!") 
       podfile.sub!("%%%uses_frameworks%%%", install_using_frameworks ? "true" : "false") 
       podfile.sub!("%%%build_xcframeworks%%%", build_xcframeworks ? "true" : "false") 
-
+      podfile.sub!("%%%build_catalyst%%%", build_catalyst ? "true" : "false") 
+      
       podfile.sub!("%%%platform_name%%%", platform.name.to_s)
       podfile.sub!("%%%deployment_version%%%", platform.deployment_target.version)
 

data/lib/pod_builder/rome/post_install.rb

@@ -3,6 +3,26 @@ require 'colored'
 require 'pathname'
 
 module PodBuilder
+  class XcodeBuildSettings
+    attr_reader :platform_name
+    attr_reader :build_destination
+
+    def initialize(platform_name)
+      @platform_name = platform_name
+   
+      case platform_name
+      when "iphoneos" then @build_destination = "generic/platform=iOS"
+      when "iphonesimulator" then @build_destination = "generic/platform=iOS Simulator"
+      when "catalyst" then @build_destination = "platform=macOS,arch=x86_64,variant=Mac Catalyst"
+      when "macos" then @build_destination = "generic/platform=OS X"
+      when "tvos" then @build_destination = "generic/platform=tvOS"
+      when "tvossimulator" then @build_destination = "generic/platform=tvOS Simulator"
+      when "watchos" then @build_destination = "generic/platform=watchOS"
+      when "watchossimulator" then @build_destination = "generic/platform=watchOS Simulator"
+      else raise "\n\nUnknown platform '#{platform_name}'".red end
+    end
+  end
+
   def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build)    
     dsym_device_folder = File.join(build_dir, "dSYM", device)
     dsym_simulator_folder = File.join(build_dir, "dSYM", simulator)
@@ -269,6 +289,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
+  build_catalyst = user_options.fetch('build_catalyst', false)
   build_xcframeworks = user_options.fetch('build_xcframeworks', false)
   
   prebuilt_root_paths = JSON.parse(user_options["prebuilt_root_paths"].gsub('=>', ':'))
@@ -291,23 +312,27 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     project_path = sandbox_root.parent + 'Pods/Pods.xcodeproj'
         
     case target.platform_name
-    when :ios then platforms = ['iphoneos', 'iphonesimulator']
-    when :osx then platforms = ['macos']
-    when :tvos then platforms = ['appletvos', 'appletvsimulator']
-    when :watchos then platforms = ['watchos', 'watchsimulator']
+    when :ios then 
+      xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("iphoneos"), PodBuilder::XcodeBuildSettings.new("iphonesimulator")]
+      if build_catalyst
+        xcodebuild_settings += [PodBuilder::XcodeBuildSettings.new("catalyst")]
+      end
+    when :osx then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("macos")]
+    when :tvos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("tvos"), PodBuilder::XcodeBuildSettings.new("tvossimulator")]
+    when :watchos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("watchos"), PodBuilder::XcodeBuildSettings.new("watchossimulator")]
     else raise "\n\nUnknown platform '#{target.platform_name}'".red end
   
-    platforms.each do |platform|
-      puts "Building xcframeworks for #{platform}".yellow
-      raise "\n\n#{platform} xcframework archive failed!".red if !system("xcodebuild archive -project #{project_path.to_s} -scheme Pods-DummyTarget -sdk #{platform} -archivePath '#{build_dir}/#{platform}' SKIP_INSTALL=NO > /dev/null")
+    xcodebuild_settings.each do |xcodebuild_setting|
+      puts "Building xcframeworks for #{xcodebuild_setting.platform_name}".yellow
+      raise "\n\n#{build_destination} xcframework archive failed!".red if !system("xcodebuild archive -project #{project_path.to_s} -scheme Pods-DummyTarget -destination '#{xcodebuild_setting.build_destination}' -archivePath '#{build_dir}/#{xcodebuild_setting.platform_name}' SKIP_INSTALL=NO > /dev/null 2>&1")
     end
 
-    built_items = Dir.glob("#{build_dir}/#{platforms.first}.xcarchive/Products/Library/Frameworks/*").reject { |t| File.basename(t, ".*") == "Pods_DummyTarget" }
+    built_items = Dir.glob("#{build_dir}/#{xcodebuild_settings[0].platform_name}.xcarchive/Products/Library/Frameworks/*").reject { |t| File.basename(t, ".*") == "Pods_DummyTarget" }
 
     built_items.each do |built_item|      
       built_item_paths = [built_item]
-      platforms.drop(1).each do |platform|
-        path = "#{build_dir}/#{platform}.xcarchive/Products/Library/Frameworks/#{File.basename(built_item)}"
+      xcodebuild_settings.drop(1).each do |xcodebuild_setting|
+        path = "#{build_dir}/#{xcodebuild_setting.platform_name}.xcarchive/Products/Library/Frameworks/#{File.basename(built_item)}"
         if File.directory?(path)
           built_item_paths.push(path)
         else
@@ -321,16 +346,16 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
       framework_name = File.basename(built_item_paths.first, ".*")
       xcframework_path = "#{base_destination}/#{framework_name}/#{framework_name}.xcframework"
       framework_params = built_item_paths.map { |t| "-framework '#{t}'"}.join(" ")
-      raise "\n\nFailed packing xcframework!".red if !system("xcodebuild -create-xcframework #{framework_params} -output '#{xcframework_path}' > /dev/null")      
+      raise "\n\nFailed packing xcframework!".red if !system("xcodebuild -create-xcframework #{framework_params} -output '#{xcframework_path}' > /dev/null 2>&1")      
 
       if enable_dsym
-        platforms.each do |platform|
-          dsym_source = "#{build_dir}/#{platform}.xcarchive/dSYMs/"
+        xcodebuild_settings.each do |xcodebuild_setting|
+          dsym_source = "#{build_dir}/#{xcodebuild_setting.platform_name}.xcarchive/dSYMs/"
           if File.directory?(dsym_source)
             destination = sandbox_root.parent + "dSYMs"
             FileUtils.mkdir_p(destination)
             FileUtils.mv(dsym_source, destination)
-            FileUtils.mv("#{destination}/dSYMs", "#{destination}/#{platform}")
+            FileUtils.mv("#{destination}/dSYMs", "#{destination}/#{xcodebuild_setting.platform_name}")
           end  
         end
       else

data/lib/pod_builder/templates/build_podfile.template

@@ -4,7 +4,7 @@ require 'cfpropertylist'
 
 %%%use_frameworks%%%
 
-plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, build_xcframeworks: %%%build_xcframeworks%%%, prebuilt_root_paths: '%%%prebuilt_root_paths%%%', pre_compile: Proc.new { |installer|
+plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, build_catalyst: %%%build_catalyst%%%, build_xcframeworks: %%%build_xcframeworks%%%, prebuilt_root_paths: '%%%prebuilt_root_paths%%%', 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.1.1"
+  VERSION = "2.2.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler