pod-builder 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4eb5820c597538d2cdca26385c8d307d1ec1136d8c393594167fae25d1de240
-  data.tar.gz: 8a489a9710bc41a6c96ec3603227cb06e0a9d376835f05976c5e595bd45d902e
+  metadata.gz: a78cc17a913b3034855029cd54e3b27ab7f5e4482c370e7a53c527c902bec7f1
+  data.tar.gz: '08abdad59a5fc4a09dd86fb3d0ca36dc93ef5f3c66a47505fc0919245f8cfd14'
 SHA512:
-  metadata.gz: 3ed8a52ba842937a2a24626c55bd67932c9a2a2af80b8b3891dd00109597e42251e4eea694b4c4f5901218de22ec6b21ae95a87f5e9f034e4467c4d9e9c8c0b3
-  data.tar.gz: 00ac3c4c7c07716d84011dab03b5524e4154172bae3ecac9cce228b2b78047738c5037f057e0d14fb0e0779b29090f83b0b8df0c3e7f9f77a59369cf954db99c
+  metadata.gz: 98738c77905e22cfc84ac3941347ab23b9fb1a6f5bb3e9a807b85795b8378f9e4cc2d31f75d1bc338f1ab828a6264f262ef01cd0efc0e4e075a8cfea80981c15
+  data.tar.gz: a2561e7991129a01f1fddc79a23e72a87af1474528d188bc686362a6040e0e798e4f66e2e882b5a273342cbf70a035554673e39cf125f0f12302f44e1625944e

data/lib/pod_builder/analyze.rb

@@ -52,7 +52,10 @@ module PodBuilder
       
       supported_platforms = analyzer.instance_variable_get("@result").targets.map { |t| t.platform.safe_string_name.downcase }
       
-      return all_specs.map { |spec| PodfileItem.new(spec, all_specs, checkout_options, supported_platforms) }.sort_by(&:name)
+      target_definitions = installer.podfile.target_definitions.values
+      items = all_specs.map { |spec| PodfileItem.new(spec, all_specs, target_definitions, checkout_options, supported_platforms) }.sort_by(&:name)
+
+      return items
     end
   end
 end

data/lib/pod_builder/command/switch.rb

@@ -1,4 +1,5 @@
 require 'pod_builder/core'
+require 'set'
 
 module PodBuilder
   module Command
@@ -87,6 +88,8 @@ module PodBuilder
           pod_names_to_switch = pod_names_to_switch.map { |t| t.split("/").first }.uniq
           dep_pod_names_to_switch.reject { |t| pod_names_to_switch.include?(t) } 
         end
+
+        inhibit_warnings = inhibit_warnings_pods()
         
         pod_names_to_switch.each do |pod_name_to_switch|
           development_path = ""
@@ -94,7 +97,7 @@ module PodBuilder
 
           case OPTIONS[:switch_mode]
           when "development"
-            development_path = find_podspec(pod_name_to_switch)               
+            development_path = find_podspec(pod_name_to_switch)              
           when "prebuilt"
             podfile_path = PodBuilder::basepath("Podfile.restore")
             content = File.read(podfile_path)
@@ -113,8 +116,7 @@ module PodBuilder
                 next
               end
     
-              matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
-              if matches&.size == 2
+              if (matches = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && matches.size == 3
                 if matches[1].split("/").first == pod_name_to_switch
                   default_entries[current_section] = line
                 end  
@@ -143,8 +145,7 @@ module PodBuilder
               current_section = line.split(" ")[1]
             end
 
-            matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
-            if matches&.size == 2
+            if (matches = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && matches.size == 3
               if matches[1].split("/").first == pod_name_to_switch
                 case OPTIONS[:switch_mode]
                 when "prebuilt"
@@ -161,6 +162,9 @@ module PodBuilder
                   indentation = line.split("pod '").first
                   rel_path = Pathname.new(development_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
                   development_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
+                  if inhibit_warnings.include?(matches[1])
+                    development_line = development_line.chomp("\n") + ", :inhibit_warnings => true\n"
+                  end
                   if line.include?("# pb<") && marker = line.split("# pb<").last
                     development_line = development_line.chomp("\n") + " # pb<#{marker}"
                   end
@@ -169,6 +173,9 @@ module PodBuilder
                   next
                 when "default"
                   if default_line = default_entries[current_section]
+                    if inhibit_warnings.include?(matches[1])
+                      default_line = default_line.chomp("\n") + ", :inhibit_warnings => true\n"
+                    end  
                     if line.include?("# pb<") && marker = line.split("# pb<").last
                       default_line = default_line.chomp("\n") + " # pb<#{marker}"
                     end
@@ -182,8 +189,6 @@ module PodBuilder
 
                     lines.append(default_line)
                     next
-                  elsif
-                    raise "\n\nLine for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile".red
                   end
                 else
                   raise "\n\nUnsupported mode '#{OPTIONS[:switch_mode]}'".red
@@ -210,6 +215,26 @@ module PodBuilder
       end
       
       private 
+
+      def self.inhibit_warnings_pods
+        ret = Set.new
+
+        podfile_path = PodBuilder::basepath("Podfile")
+        content = File.read(podfile_path)
+
+        content.each_line do |line|
+          unless (name_match = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && name_match.size == 3
+            next
+          end
+
+          if line.gsub(" ", "").include?(":inhibit_warnings=>true")
+            pod_name = name_match[1]
+            ret.add?(pod_name)
+          end
+        end
+
+        return ret
+      end
       
       def self.is_absolute_path(path)
         return ["~", "/"].any? { |t| path.start_with?(t) }

data/lib/pod_builder/podfile_item.rb

@@ -142,6 +142,10 @@ module PodBuilder
     # @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
+
+    # @return [Bool] True if warnings should be inhibited for the pod
+    #
+    attr_accessor :inhibit_warnings
     
     # Initialize a new instance
     #
@@ -149,7 +153,7 @@ module PodBuilder
     #
     # @param [Hash] checkout_options
     #
-    def initialize(spec, all_specs, checkout_options, supported_platforms)
+    def initialize(spec, all_specs, target_definitions, checkout_options, supported_platforms)
       @name = spec.name
       @root_name = spec.name.split("/").first
 
@@ -264,6 +268,7 @@ module PodBuilder
       @build_xcframework = build_as_xcframework
 
       @is_prebuilt = extract_is_prebuilt(spec, all_specs, checkout_options, supported_platforms)
+      @inhibit_warnings = target_definitions.any? { |t| t.inhibits_warnings_for_pod?(@name) }
     end
 
     def pod_specification(all_poditems, parent_spec = nil)
@@ -370,6 +375,10 @@ module PodBuilder
     def entry(include_version = true, include_pb_entry = true)
       e = "pod '#{@name}'"
 
+      if !is_prebuilt && inhibit_warnings
+        e += ", :inhibit_warnings => true"
+      end
+
       unless include_version
         return e
       end
@@ -478,7 +487,7 @@ module PodBuilder
       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)
+            default_item = PodfileItem.new(default_spec, all_specs, [], checkout_options, supported_platforms)
             if default_item.is_prebuilt
               return true
             end

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Prebuild CocoaPods pods