pod-builder 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d2e466990adefdd924214e92d94859aefc2d8b844722b87a602a53c8650a19
-  data.tar.gz: 59511ec436382352ed7ca9d51ee1b60d72770a24297a27afd947514afc8f789e
+  metadata.gz: '09cbb24dc2fb49946058f0459990c762afd54e93dfe280289203348162272611'
+  data.tar.gz: 87fc03146c5a8a7fbe2adcc895e8a45c8b24b517b00c557236245902df543267
 SHA512:
-  metadata.gz: '09e89f2b8fefbc51d505f7205a9298e4298332b3442597c45d13da17efe74ee9099ded49613aa432e377d303f83e1a607735c07b16b9e3dfa91b52b556b9d43f'
-  data.tar.gz: 6f6b831daa3db4d01feafdf73103098cf95f0c7ad3e058ec074ccf984b339605772fc799f45241a9fb6cac490499b86943e8f7f268ff43113f79276d9146ca88
+  metadata.gz: 221ccda81fbd9b41d4439ebaa6a8ea3776e4c1d91ea3b24d268fa54203e67e757160ad0e42595527e0e610845ec1faf546aa9d480463f808aae28c94df4710e4
+  data.tar.gz: ef65cce139a54a6ae93e5262e480a3608e9b268a51cf413da58e314d29568c6981f5b198dc1061d93d102ec112935dc890d7e5b009fabd0cc4cc88cce52e9650

data/lib/pod_builder/podfile_item.rb

@@ -138,6 +138,10 @@ module PodBuilder
     # @return [Bool] Should build as xcframework
     #
     attr_accessor :build_xcframework
+
+    # @return [Bool] True if it's a pod that doesn't provide source code (is already shipped as a prebuilt pod)
+    #
+    attr_accessor :is_prebuilt
     
     # Initialize a new instance
     #
@@ -246,6 +250,8 @@ module PodBuilder
         build_as_xcframework = Configuration.build_xcframeworks_include.include?(@root_name)
       end
       @build_xcframework = build_as_xcframework
+
+      @is_prebuilt = extract_is_prebuilt(spec, all_specs, checkout_options, supported_platforms)
     end
 
     def pod_specification(all_poditems, parent_spec = nil)
@@ -335,33 +341,6 @@ module PodBuilder
       return deps
     end
 
-    # @return [Bool] True if it's a pod that doesn't provide source code (is already shipped as a prebuilt pod)
-    #    
-    def is_prebuilt
-      if Configuration.force_prebuild_pods.include?(@root_name) || Configuration.force_prebuild_pods.include?(@name)
-        return false
-      end
-
-      # We treat pods to skip like prebuilt ones
-      if Configuration.skip_pods.include?(@root_name) || Configuration.skip_pods.include?(@name)
-        return true
-      end
-
-      # Podspecs aren't always properly written (source_file key is often used instead of header_files)
-      # Therefore it can become tricky to understand which pods are already precompiled by boxing a .framework or .a
-      embedded_as_vendored = vendored_frameworks.map { |x| File.basename(x) }.include?("#{module_name}.framework")
-      embedded_as_static_lib = vendored_libraries.map { |x| File.basename(x) }.include?("lib#{module_name}.a")
-      
-      only_headers = (source_files.count > 0 && @source_files.all? { |x| x.end_with?(".h") })
-      no_sources = (@source_files.count == 0 || only_headers) && (@vendored_frameworks + @vendored_libraries).count > 0
-
-      if !no_sources && !only_headers
-        return false
-      else
-        return (no_sources || only_headers || embedded_as_static_lib || embedded_as_vendored)
-      end
-    end
-
     # @return [Bool] True if it's a subspec
     #
     def is_subspec
@@ -472,6 +451,44 @@ module PodBuilder
 
     private
 
+    # @return [Bool] True if it's a pod that doesn't provide source code (is already shipped as a prebuilt pod)
+    #    
+    def extract_is_prebuilt(spec, all_specs, checkout_options, supported_platforms)
+      if Configuration.force_prebuild_pods.include?(@root_name) || Configuration.force_prebuild_pods.include?(@name)
+        return false
+      end
+
+      # We treat pods to skip like prebuilt ones
+      if Configuration.skip_pods.include?(@root_name) || Configuration.skip_pods.include?(@name)
+        return true
+      end
+
+      if default_subspecs != nil && default_subspecs.count > 0
+        default_subspecs.each do |default_subspec_name|
+          if (default_spec = all_specs.detect { |t| t.name == "#{root_name}/#{default_subspec_name}" })
+            default_item = PodfileItem.new(default_spec, all_specs, checkout_options, supported_platforms)
+            if default_item.is_prebuilt
+              return true
+            end
+          end
+        end
+      end
+
+      # Podspecs aren't always properly written (source_file key is often used instead of header_files)
+      # Therefore it can become tricky to understand which pods are already precompiled by boxing a .framework or .a
+      embedded_as_vendored = vendored_frameworks.map { |x| File.basename(x) }.include?("#{module_name}.framework")
+      embedded_as_static_lib = vendored_libraries.map { |x| File.basename(x) }.include?("lib#{module_name}.a")
+      
+      only_headers = (source_files.count > 0 && @source_files.all? { |x| x.end_with?(".h") })
+      no_sources = (@source_files.count == 0 || only_headers) && (@vendored_frameworks + @vendored_libraries).count > 0
+
+      if !no_sources && !only_headers
+        return false
+      else
+        return (no_sources || only_headers || embedded_as_static_lib || embedded_as_vendored)
+      end
+    end
+
     def extract_vendored_frameworks(spec, all_specs)
       items = []
 

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end
   

metadata

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