pod-builder 5.1.4 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b85a52e3ba807b8439a542523ff6e38744c83d297356a395dbaf2574c8f43ba
-  data.tar.gz: de67f37c0e7aea4cc9f3d6f221f794134d61ba2a46e1b2c8dd2ae00c927bee4f
+  metadata.gz: 2a195ea19893b53adf9bffdd392dfc0c71b96448ba87f9431e91350f5aaf928a
+  data.tar.gz: 2ab6e876ef84047c0c813025eef5681643ddc64fe3a79b96e2e732732646a945
 SHA512:
-  metadata.gz: 2736c6181c7e2efb50721cd6d3ad3897e57376d042452ec9b54e3edb44700555e160ccb62cff2b633d82b7a75cf9a9b0dfab2bf1549206b08a03146ecdee1735
-  data.tar.gz: 48105f7082152c2a0edcf79eee64f0bdccd536f6fcc389823073520754ebec45ce350d50f52af9f4e86ece11632fc5f8417e9ec182025d229d6c458073ee706e
+  metadata.gz: 2a8cb5a1d34c4991308160ec49483eefa0f731b3af7894429d41580da2b20b49ca0c8513e1a9ba8ee293f67ff316f83e93b273bf57754b4107294283bc7e1499
+  data.tar.gz: 640ec2216ddf0d6e880e14589b4bed129a86203b05a291f242dd12ed1ccde4a7e7d98a68b00e3a6eb7ddc46abdf830f8f1ee450597f16d6d3c1a1732286b6e42

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`
 

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
@@ -94,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 = []
@@ -167,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
@@ -313,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

data/lib/pod_builder/info.rb

@@ -1,4 +1,4 @@
-require 'json'
+require "json"
 
 module PodBuilder
   class Info
@@ -7,57 +7,57 @@ module PodBuilder
       result = {}
       name = nil
 
-      Dir.glob(PodBuilder::prebuiltpath("**/#{Configuration.prebuilt_info_filename}")).each do |json_path|         
+      Dir.glob(PodBuilder::prebuiltpath("**/#{Configuration.prebuilt_info_filename}")).each do |json_path|
         name, prebuilt_info = prebuilt_info(json_path)
         result[name] = prebuilt_info
       end
 
       return result
     end
-    
+
     private
 
     def self.pod_name_from_entry(line)
       if (matches = line&.match(/pod '(.*?)'/)) && matches.size == 2
         pod_name = matches[1]
-        
+
         return pod_name
       end
 
       return "unknown_podname"
     end
-    
+
     def self.version_info_from_entry(line)
       if (matches = line&.match(/pod '(.*)', '=(.*)'/)) && matches.size == 3
         pod_name = matches[1]
         tag = matches[2]
-        
+
         return { "tag": tag }
       elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :commit => '(.*)'/)) && matches.size == 4
         pod_name = matches[1]
         repo = matches[2]
         hash = matches[3]
-        
+
         return { "repo": repo, "hash": hash }
       elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :branch => '(.*)'/)) && matches.size == 4
         pod_name = matches[1]
         repo = matches[2]
         branch = matches[3]
-        
+
         return { "repo": repo, "branch": branch }
       elsif (matches = line&.match(/pod '(.*)', :git => '(.*)', :tag => '(.*)'/)) && matches.size == 4
         pod_name = matches[1]
         repo = matches[2]
         tag = matches[3]
-        
+
         return { "repo": repo, "tag": tag }
       elsif (matches = line&.match(/pod '(.*)', :path => '(.*)'/)) && matches.size == 3
         pod_name = matches[1]
-        
+
         return { "repo": "local" }
       elsif (matches = line&.match(/pod '(.*)', :podspec => '(.*)'/)) && matches.size == 3
         pod_name = matches[1]
-        
+
         return { "repo": "local" }
       else
         raise "\n\nFailed extracting version from line:\n#{line}\n".red
@@ -70,21 +70,22 @@ module PodBuilder
       end
 
       data = JSON.load(File.read(path))
-            
+
       result = {}
       if swift_version = data["swift_version"]
-        result.merge!({ "swift_version": swift_version})
+        result.merge!({ "swift_version": swift_version })
       end
-      
+
       pod_version = version_info_from_entry(data["entry"])
       pod_name = pod_name_from_entry(data["entry"])
 
       result.merge!({ "version": pod_version })
       result.merge!({ "specs": (data["specs"] || []) })
       result.merge!({ "is_static": (data["is_static"] || false) })
+      result.merge!({ "pb_version": (data["pb_version"] || "0.0.0") })
       result.merge!({ "original_compile_path": (data["original_compile_path"] || "") })
-      
+
       return pod_name, result
-    end    
+    end
   end
-end
+end

data/lib/pod_builder/install.rb

@@ -70,7 +70,7 @@ module PodBuilder
 
         copy_prebuilt_items(podfile_items - prebuilt_entries)
 
-        prebuilt_info = prebuilt_info(podfile_items)
+        prebuilt_info = prebuilt_info(podfile_items, argument_pods)
         licenses = license_specifiers()
 
         if !OPTIONS.has_key?(:debug)
@@ -99,7 +99,7 @@ module PodBuilder
       end
     end
 
-    def self.prebuilt_info(podfile_items)
+    def self.prebuilt_info(podfile_items, argument_pods)
       gitignored_files = PodBuilder::gitignoredfiles
 
       swift_version = PodBuilder::system_swift_version
@@ -138,6 +138,9 @@ module PodBuilder
         if hash = build_folder_hash(podfile_item, gitignored_files)
           data["build_folder_hash"] = hash
         end
+        if argument_pods.include?(podfile_item.root_name)
+          data["pb_version"] = PodBuilder::VERSION
+        end
 
         ret.merge!({ podbuilder_file => data })
       end

data/lib/pod_builder/podfile.rb

@@ -111,12 +111,12 @@ module PodBuilder
             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}\""
+              other_swift_flags_override += " -coverage-prefix-map \"/private#{from}/\"=\"#{to}/\""
+              other_c_flags_override += " -fcoverage-prefix-map=\"/private#{from}/\"=\"#{to}/\""
+            else
+              other_swift_flags_override += " -coverage-prefix-map \"#{from}/\"=\"#{to}/\""
+              other_c_flags_override += " -fcoverage-prefix-map=\"#{from}/\"=\"#{to}/\""
             end
-
-            other_swift_flags_override += " -coverage-prefix-map \"#{from}\"=\"#{to}\""
-            other_c_flags_override += " -fcoverage-prefix-map=\"#{from}\"=\"#{to}\""
           end
         end
 

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "5.1.4"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.2.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler