pod-builder 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb2a7642ff281371f45e15c62966fd461fc47d79c573d553926e8ac37327b34
-  data.tar.gz: b4ea4ef42a12bdeb1b23a4824c07ecdf7f24d459e2c4ed00a39e3ab664961214
+  metadata.gz: 0dada31dddd8303f3429e7ebbb13665f6c1e8b4d66ad618795971c652ecb3f7b
+  data.tar.gz: 290cdba5a29f1672372057f28ec9a867dcba0172b97b1e4c7a6a0cc2a83b6aed
 SHA512:
-  metadata.gz: 2b686f329d928e794cf6809eb6c51078692e6e9fdf8f522e345c6bedfc8a1f68fa883613c0e86f7faf202246eb278478a194c60155916996edf24c2b5d3619e2
-  data.tar.gz: 0df40657505a0d8fc5af1319d695929a883ba304acb79ece94caeaaebe454a7285f183f9a2fa9284915a315e1756f077b35f689d73f7b09aa1843b5c602594f8
+  metadata.gz: f0af1cd519bdea4f141c374853c631bfb46813ae0c2caad40d92c7716fbc941e9f5dc4772b6358c368b76840937478fe75f3cb3c4df2508b7593ac527c582ebf
+  data.tar.gz: 3087670122ad1420438ac6944056e11858b62752aa7b1749b0b4411515d4ceacc80178b045027da3fcfe2404ad33b44be3ab5de64dd1b689fbd5753988783eff

data/README.md

@@ -280,9 +280,17 @@ Like `build_settings` but per pod. Pod name can also refer to subspec.
 
 Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Latest`.
 
-#### `build_xcframeworks`
+#### `build_xcframeworks_all`
 
-Specify if PodBuilder will build .xcframeworks. Will enable `library_evolution_support`. Default value: false
+Specify if PodBuilder should build all pods as .xcframeworks. Will enable `library_evolution_support`. Default value: false
+
+#### `build_xcframeworks_exclude`
+
+Specify which pods PodBuilder should NOT be built as .xcframeworks when `build_xcframeworks_all` is true. Default value: []
+
+#### `build_xcframeworks_include`
+
+Specify which pods PodBuilder should be built as .xcframeworks. Will enable `library_evolution_support`. Default value: []
 
 #### `library_evolution_support`
 
@@ -327,11 +335,8 @@ The podspec of the Pod you're trying to build doesn't specify the swift_version
 
 ```json
 "spec_overrides": {
-    "Google-Mobile-Ads-SDK": {
-      "module_name": "GoogleMobileAds"
-    },
     "PodWithError": {
-      "swift_version": "5.0"
+      "swift_version": "5.3"
     }
 }
 ```

data/lib/pod_builder/command/build.rb

@@ -63,9 +63,21 @@ module PodBuilder
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
         pods_to_build_release = pods_to_build - pods_to_build_debug
 
+        pods_to_build_debug_xcframework = pods_to_build_debug.select { |x| x.build_xcframework }
+        pods_to_build_debug -= pods_to_build_debug_xcframework
+
+        pods_to_build_release_xcframework = pods_to_build_release.select { |x| x.build_xcframework }
+        pods_to_build_release -= pods_to_build_release_xcframework
+
         check_dependencies_build_configurations(all_buildable_items)
 
-        podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
+        # When building mixed framwork/xcframeworks pods xcframeworks should be built last 
+        # so that the .xcframework overwrite the .framwork if the same pod needs to be built
+        # in both ways. 
+        # For example we might have configured to build onlt PodA as xcframework, another pod
+        # PodB has a dependency to PodA. When Building PodB, PodA gets rebuilt as .framework
+        # but then PodA gets rebuilt again as .xcframework overwriting the .framework.
+        podfiles_items = [pods_to_build_debug] + [pods_to_build_release] + [pods_to_build_debug_xcframework] + [pods_to_build_release_xcframework]
 
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
         if Configuration.react_native_project
@@ -86,7 +98,8 @@ module PodBuilder
           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, build_catalyst, Configuration.build_xcframeworks)
+
+          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, podfile_items.first.build_xcframework)
           
           install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
           

data/lib/pod_builder/configuration.rb

@@ -39,19 +39,10 @@ module PodBuilder
         "ENABLE_BITCODE": "NO"
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
-
-    DEFAULT_FORCE_PREBUILD_PODS = []
-    DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
-    DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
-    DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
-    DEFAULT_BUILD_USING_REPO_PATHS = false
-    DEFAULT_BUILD_XCFRAMEWORKS = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SETTINGS_OVERRIDES
-    private_constant :DEFAULT_BUILD_SYSTEM
-    private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
+    private_constant :DEFAULT_SPEC_OVERRIDE
     
     class <<self      
       attr_accessor :allow_building_development_pods
@@ -81,19 +72,22 @@ module PodBuilder
       attr_accessor :build_using_repo_paths
       attr_accessor :react_native_project
       attr_accessor :lldbinit_name
-      attr_accessor :build_xcframeworks
+      attr_accessor :build_xcframeworks_all
+      attr_accessor :build_xcframeworks_include
+      attr_accessor :build_xcframeworks_exclude
     end
-    
-    @allow_building_development_pods = false
+
     @build_settings = DEFAULT_BUILD_SETTINGS
     @build_settings_overrides = DEFAULT_BUILD_SETTINGS_OVERRIDES
-    @build_system = DEFAULT_BUILD_SYSTEM
-    @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
-    @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @spec_overrides = DEFAULT_SPEC_OVERRIDE
+
+    @allow_building_development_pods = false
+    @build_system = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
+    @library_evolution_support = false
+    @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @skip_licenses = []
-    @skip_pods = DEFAULT_SKIP_PODS
-    @force_prebuild_pods = DEFAULT_FORCE_PREBUILD_PODS
+    @skip_pods = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
+    @force_prebuild_pods = []
     @license_filename = "Pods-acknowledgements"
     @development_pods_paths = []
     @build_base_path = "/tmp/pod_builder".freeze
@@ -110,11 +104,13 @@ module PodBuilder
     @use_bundler = false
     @deterministic_build = false
 
-    @supported_platforms = DEFAULT_PLATFORMS
-    @build_using_repo_paths = DEFAULT_BUILD_USING_REPO_PATHS
+    @supported_platforms = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
+    @build_using_repo_paths = false
     @react_native_project = false
 
-    @build_xcframeworks = DEFAULT_BUILD_XCFRAMEWORKS
+    @build_xcframeworks_all = false
+    @build_xcframeworks_include = []
+    @build_xcframeworks_exclude = []
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -218,12 +214,22 @@ module PodBuilder
             Configuration.react_native_project = value
           end
         end
-        if value = json["build_xcframeworks"]
+        if value = json["build_xcframeworks_all"]
           if [TrueClass, FalseClass].include?(value.class)
-            Configuration.build_xcframeworks = value
+            Configuration.build_xcframeworks_all = value
           end
         end
-        
+        if value = json["build_xcframeworks_include"]
+          if value.is_a?(Array)
+            Configuration.build_xcframeworks_include = value
+          end
+        end
+        if value = json["build_xcframeworks_exclude"]
+          if value.is_a?(Array)
+            Configuration.build_xcframeworks_exclude = value
+          end
+        end
+
         Configuration.build_settings.freeze
 
         sanity_check()
@@ -279,6 +285,11 @@ module PodBuilder
           puts "PodBuilder.json contains '#{pod}' both in `force_prebuild_pods` and `skip_pods`. Will force prebuilding.".yellow
         end
       end
+      if Configuration.build_xcframeworks_all
+        raise "Invalid PodBuilder.json configuration: 'build_xcframeworks_all' is true and 'build_xcframeworks_include' is not empty" if Configuration.build_xcframeworks_include.count > 0
+      else
+        raise "Invalid PodBuilder.json configuration: 'build_xcframeworks_all' is false and 'build_xcframeworks_exclude' is not empty" if Configuration.build_xcframeworks_exclude.count > 0
+      end
     end
     
     def self.config_path

data/lib/pod_builder/install.rb

@@ -379,6 +379,7 @@ module PodBuilder
       pod_names.each do |pod_name|   
         root_name = pod_name.split("/").first
 
+        # Remove existing files
         items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(root_name)}/**/*")
         items_to_delete.each { |t| PodBuilder::safe_rm_rf(t) }
       end
@@ -393,6 +394,14 @@ module PodBuilder
           next
         end
 
+        if podfile_item = podfile_items.detect { |t| t.root_name == pod_name }
+          if Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftinterface").count > 0
+            # We can safely remove .swiftmodule if .swiftinterface exists
+            swiftmodule_files = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftmodule")
+            swiftmodule_files.each { |t| PodBuilder::safe_rm_rf(t) }
+          end
+        end
+
         unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
           destination_folder = PodBuilder::prebuiltpath(root_name)
           FileUtils.mkdir_p(destination_folder)

data/lib/pod_builder/podfile.rb

@@ -60,11 +60,7 @@ module PodBuilder
 
         if Configuration.build_system == "Legacy"
           build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "NO"
-          raise "\n\nCan't enable library evolution support with legacy build system!".red if Configuration.library_evolution_support
-        elsif Configuration.library_evolution_support
-          build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
-        end
-        if Configuration.build_xcframeworks
+        elsif Configuration.library_evolution_support || item.build_xcframework
           build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
         end
 

data/lib/pod_builder/podfile_item.rb

@@ -103,27 +103,27 @@ module PodBuilder
     #
     attr_accessor :libraries
 
-    # @return [String] source_files
+    # @return [String] Source_files
     #
     attr_accessor :source_files
 
-    # @return [String] license
+    # @return [String] License
     #
     attr_accessor :license
 
-    # @return [String] summary
+    # @return [String] Summary
     #
     attr_accessor :summary
 
-    # @return [Hash] source
+    # @return [Hash] Source
     #
     attr_accessor :source
 
-    # @return [Hash] authors
+    # @return [Hash] Authors
     #
     attr_accessor :authors
 
-    # @return [String] homepage
+    # @return [String] Homepage
     #
     attr_accessor :homepage
 
@@ -134,6 +134,10 @@ module PodBuilder
     # @return [Bool] Defines module
     #
     attr_accessor :defines_module
+
+    # @return [Bool] Should build as xcframework
+    #
+    attr_accessor :build_xcframework
     
     # Initialize a new instance
     #
@@ -235,6 +239,13 @@ module PodBuilder
       @source = spec.root.attributes_hash.fetch("source", { "git"=>"https://github.com/Subito-it/PodBuilder.git" })
       @authors = spec.root.attributes_hash.fetch("authors", {"PodBuilder"=>"pod@podbuilder.com"})
       @homepage = spec.root.attributes_hash.fetch("homepage", "https://github.com/Subito-it/PodBuilder")
+
+      if Configuration.build_xcframeworks_all
+        build_as_xcframework = !Configuration.build_xcframeworks_exclude.include?(@root_name)
+      else
+        build_as_xcframework = Configuration.build_xcframeworks_include.include?(@root_name)
+      end
+      @build_xcframework = build_as_xcframework
     end
 
     def pod_specification(all_poditems, parent_spec = nil)

data/lib/pod_builder/podspec.rb

@@ -53,7 +53,11 @@ module PodBuilder
           resources = []
           exclude_files = []
           vendored_frameworks.each do |vendored_framework|
-            binary_path = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{vendored_framework}/**/#{File.basename(vendored_framework, ".*")}")).first
+            if vendored_framework.end_with?(".xcframework")
+              binary_path = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{vendored_framework}/**/#{File.basename(vendored_framework, ".*")}")).reject { |t| t.include?("simulator") }.first
+            else
+              binary_path = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{vendored_framework}/**/#{File.basename(vendored_framework, ".*")}")).first
+            end
 
             next if binary_path.nil?
 

data/lib/pod_builder/rome/post_install.rb

@@ -6,9 +6,11 @@ module PodBuilder
   class XcodeBuildSettings
     attr_reader :platform_name
     attr_reader :build_destination
+    attr_reader :configuration
 
-    def initialize(platform_name)
+    def initialize(platform_name, configuration)
       @platform_name = platform_name
+      @configuration = configuration
    
       case platform_name
       when "iphoneos" then @build_destination = "generic/platform=iOS"
@@ -313,18 +315,18 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
         
     case target.platform_name
     when :ios then 
-      xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("iphoneos"), PodBuilder::XcodeBuildSettings.new("iphonesimulator")]
+      xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("iphoneos", configuration), PodBuilder::XcodeBuildSettings.new("iphonesimulator", configuration)]
       if build_catalyst
-        xcodebuild_settings += [PodBuilder::XcodeBuildSettings.new("catalyst")]
+        xcodebuild_settings += [PodBuilder::XcodeBuildSettings.new("catalyst", configuration)]
       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")]
+    when :osx then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("macos", configuration)]
+    when :tvos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("tvos", configuration), PodBuilder::XcodeBuildSettings.new("tvossimulator", configuration)]
+    when :watchos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("watchos", configuration), PodBuilder::XcodeBuildSettings.new("watchossimulator", configuration)]
     else raise "\n\nUnknown platform '#{target.platform_name}'".red end
   
     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")
+      raise "\n\n#{build_destination} xcframework archive failed!".red if !system("xcodebuild archive -project #{project_path.to_s} -scheme Pods-DummyTarget -configuration #{xcodebuild_setting.configuration} -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}/#{xcodebuild_settings[0].platform_name}.xcarchive/Products/Library/Frameworks/*").reject { |t| File.basename(t, ".*") == "Pods_DummyTarget" }

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.3.0"
+  VERSION = "3.0.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler