pod-builder 5.1.3 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2cb815e28962d60864f492113989c74f22c4f748d885c3d254dbf61498ea71
-  data.tar.gz: 5447af84ddc6338359cc87cfb3369a3911972c10de1f8baef51806526a30208b
+  metadata.gz: f4933e55a3964f7ac116ee774b3ba1b5e576f58e3ac75c47154c9ec9dc5b3796
+  data.tar.gz: 8123dd9ddda019f7bb1701e36400d369e44728df85315f40c2ddffaf4a9a6d1f
 SHA512:
-  metadata.gz: 73e327fbf2f743922403bf8f9c4658be45172a20fb2bbf6bac29417c8633f44d07eff30c86caa2fe0a2fcdf202bdb8b97a9d5c6d24d497bac64822acb34f8acc
-  data.tar.gz: 295d055515da012630407a45991266b91edcd102f597a6433670f1448505b61c63ff0c410d3a396ba7085bc49786520ca01feba7cbf19625e681405af4a8b6e3
+  metadata.gz: 247d0d6e6ee175425d37cb98fe73b899deaaae483d1fbc1f39f26182ff5bb9667ff6ace2605ae558fd3eea3eca9969e4eb83e171ed6ce0e20b702c65d995fa4d
+  data.tar.gz: 61020f110c8c329de3bc5c2c67442ecbc6fd826186ebe6552db6c56c5ec3c00e992e0a0320bfc813185f631c096b48b4f0259b28b26b827b56e7ca705a734184

data/README.md

@@ -242,6 +242,18 @@ You may want to skip some pods to be prebuilt, you can do that as follows:
 }
 ```
 
+#### `skip_build_configuration_check`
+
+PodBuilder performs validation checks to prevent building pods that are marked to be built with different build configurations. In some edge case scenarious you might want to skip these checks as follows:
+
+```json
+{
+    "skip_build_configuration_check": [
+        "PodA"
+        ]
+}
+```
+
 
 #### `force_prebuild_pods`
 
@@ -308,6 +320,14 @@ Specify which pods PodBuilder should NOT be built as .xcframeworks when `build_x
 
 Specify which pods PodBuilder should be built as .xcframeworks. Will enable `library_evolution_support`. Default value: []
 
+#### `generate_coverage`
+
+Specify if coverage data for use with profiled execution should be generated. Default value: false
+
+#### `remap_coverage_to_project_root`
+
+Specify if code coverage source code references should be remapped with relative paths to the project root folder. Default value: false
+
 #### `library_evolution_support`
 
 Specify if Swift frameworks should be compiled with library evolution support (BUILD_LIBRARY_FOR_DISTRIBUTION). Default value: false

data/lib/pod_builder/command/build.rb

@@ -232,6 +232,8 @@ module PodBuilder
       end
 
       def self.check_dependencies_build_configurations(pods)
+        pods = pods.reject { |t| Configuration::skip_build_configuration_check.include?(t.name) }
+
         pods.each do |pod|
           pod_dependency_names = pod.dependency_names.select { |x| !pod.has_common_spec(x) }
 
@@ -241,7 +243,9 @@ module PodBuilder
           pods_with_unaligned_build_configuration = pods_with_common_deps.select { |x| x.build_configuration != pod.build_configuration }
           pods_with_unaligned_build_configuration.map!(&:name)
 
-          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies\n".red if pods_with_unaligned_build_configuration.count > 0
+          if pods_with_unaligned_build_configuration.count > 0
+            raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies\n".red
+          end
         end
       end
 

data/lib/pod_builder/configuration.rb

@@ -54,6 +54,7 @@ module PodBuilder
       attr_accessor :spec_overrides
       attr_accessor :skip_licenses
       attr_accessor :skip_pods
+      attr_accessor :skip_build_configuration_check
       attr_accessor :force_prebuild_pods
       attr_accessor :license_filename
       attr_accessor :development_pods_paths
@@ -75,6 +76,8 @@ module PodBuilder
       attr_accessor :build_xcframeworks_all
       attr_accessor :build_xcframeworks_include
       attr_accessor :build_xcframeworks_exclude
+      attr_accessor :generate_coverage
+      attr_accessor :remap_coverage_to_project_root
       attr_accessor :keep_swiftmodules
       attr_accessor :pre_actions
       attr_accessor :post_actions
@@ -92,6 +95,7 @@ module PodBuilder
     @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 = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules", "FBReactNativeSpec", "fmt", "RCT-Folly", "React-jsi"] # Not including React-RCTNetwork might loose some debug warnings
+    @skip_build_configuration_check = []
     @force_prebuild_pods = []
     @license_filename = "Pods-acknowledgements"
     @development_pods_paths = []
@@ -113,10 +117,13 @@ module PodBuilder
     @build_using_repo_paths = false
     @react_native_project = false
 
-    @build_xcframeworks_all = false
+    @build_xcframeworks_all = true
     @build_xcframeworks_include = []
     @build_xcframeworks_exclude = []
 
+    @generate_coverage = false
+    @remap_coverage_to_project_root = false
+
     @keep_swiftmodules = false
 
     @pre_actions = {}
@@ -162,6 +169,11 @@ module PodBuilder
             Configuration.skip_pods = value
           end
         end
+        if value = json["skip_build_configuration_check"]
+          if value.is_a?(Array)
+            Configuration.skip_build_configuration_check = value
+          end
+        end
         if value = json["force_prebuild_pods"]
           if value.is_a?(Array)
             Configuration.force_prebuild_pods = value
@@ -242,6 +254,16 @@ module PodBuilder
             Configuration.build_xcframeworks_exclude = value
           end
         end
+        if value = json["generate_coverage"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.generate_coverage = value
+          end
+        end
+        if value = json["remap_coverage_to_project_root"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.remap_coverage_to_project_root = value
+          end
+        end
         if value = json["keep_swiftmodules"]
           if [TrueClass, FalseClass].include?(value.class)
             Configuration.keep_swiftmodules = value
@@ -298,6 +320,7 @@ module PodBuilder
       config["spec_overrides"] = Configuration.spec_overrides
       config["skip_licenses"] = Configuration.skip_licenses
       config["skip_pods"] = Configuration.skip_pods
+      config["skip_build_configuration_check"] = Configuration.skip_build_configuration_check
       config["force_prebuild_pods"] = Configuration.force_prebuild_pods
       config["build_settings"] = Configuration.build_settings
       config["build_settings_overrides"] = Configuration.build_settings_overrides
@@ -329,6 +352,9 @@ module PodBuilder
       else
         raise "\n\nInvalid PodBuilder.json configuration: 'build_xcframeworks_all' is false and 'build_xcframeworks_exclude' is not empty\n".red if Configuration.build_xcframeworks_exclude.count > 0
       end
+      unless Configuration.generate_coverage
+        raise "\n\nInvalid PodBuilder.json configuration: 'remap_coverage_to_project_root' is true but `generate_coverage` is false\n".red if Configuration.remap_coverage_to_project_root
+      end
     end
 
     def self.config_path

data/lib/pod_builder/podfile.rb

@@ -43,6 +43,8 @@ module PodBuilder
 
       podfile_build_settings = ""
 
+      git_rootpath = PodBuilder::git_rootpath
+
       pod_dependencies = {}
 
       items.each do |item|
@@ -87,6 +89,36 @@ 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"
         other_swift_flags_override = " $(inherited) -Xfrontend -no-clang-module-breadcrumbs -Xfrontend -no-serialize-debugging-options"
+        other_c_flags_override = " $(inherited)"
+
+        if Configuration.generate_coverage
+          other_swift_flags_override += " -profile-coverage-mapping -profile-generate"
+          other_c_flags_override += " -fprofile-instr-generate -fcoverage-mapping"
+        end
+
+        if Configuration.remap_coverage_to_project_root
+          # Remap coverage path from /tmp/pod_builder/Pods/ItemName -> path relative to project git_root
+          replacements = []
+          if path = item.path
+            replacements << ["#{Configuration.build_path}/Pods/#{item.root_name}", PodBuilder::basepath(path)]
+            replacements << ["#{Configuration.build_path}/Pods/#{File.basename(path)}", PodBuilder::basepath(path)]
+          else
+            replacements << ["#{Configuration.build_path}/Pods/#{item.root_name}", PodBuilder::project_path("Pods/#{item.root_name}")]
+          end
+          replacements.uniq!
+
+          replacements.each do |from, to|
+            to = "./" + Pathname.new(to).relative_path_from(Pathname.new(git_rootpath)).to_s
+
+            if from.start_with?("/tmp")
+              other_swift_flags_override += " -coverage-prefix-map \"/private#{from}\"=\"#{to}\""
+              other_c_flags_override += " -fcoverage-prefix-map=\"/private#{from}\"=\"#{to}\""
+            end
+
+            other_swift_flags_override += " -coverage-prefix-map \"#{from}\"=\"#{to}\""
+            other_c_flags_override += " -fcoverage-prefix-map=\"#{from}\"=\"#{to}\""
+          end
+        end
 
         item_build_settings.each do |k, v|
           # Do not allow to override above settings which are mandatory for a correct compilation
@@ -97,6 +129,7 @@ module PodBuilder
 
         # All the below settings should be merged with global (Configuration.build_settings) or per pod build_settings (Configuration.build_settings_overrides)
         build_settings["OTHER_SWIFT_FLAGS"] = build_settings.fetch("OTHER_SWIFT_FLAGS", "") + other_swift_flags_override
+        build_settings["OTHER_CFLAGS"] = build_settings.fetch("OTHER_CFLAGS", "") + other_c_flags_override
 
         podfile_build_settings += "set_build_settings(\"#{item.root_name}\", #{build_settings.to_s}, installer)\n  "
 

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "5.1.3"
+  VERSION = "5.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.5
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler