pod-builder 2.0.0.beta.34 → 2.0.0.beta.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31aa509b926c753841f3739996fad1be623bac4ceee8ae30ae9b1ee254f2ddb3
-  data.tar.gz: 56df221c8e00be54c33cfa491629d0d13a22087108d8722a8bf925cbd85e959e
+  metadata.gz: 037b4a3f456716c55d38e1ec98307ff27e87b97c908dd5e80e5895e9686f6e3f
+  data.tar.gz: 82dbc45cb9220beb68fe1b76c26ac11f6f8d45927e35fa73ecdd754609742830
 SHA512:
-  metadata.gz: 3b55c31c20f5e676ff8c004d233449cbd57acac51d2fb7925340e7e25c949e9c72743ba2683255b34e5ea72bf13da5394b39f2cd0383fa95d82f9ebbb263c948
-  data.tar.gz: 05e76c637a0dcb3856698ce8f144e9ca734e4463edfe19ed9677c87dee7447b473da3e0918fb7c0c79f78b90604938ebe7d2b22ba1826f74377fb808ba77818e
+  metadata.gz: d067c51f54eea74198b8d9ae7a85a25d271666ca3301836ab14920f52c5d9dc47aae4dfafea4de43953c09b5d15cbede4f7bcd0841772c55e7a6f057e61a737b
+  data.tar.gz: 504fd2e0adec760b4a58d26bec752b3dcf7755b425a0b109662e8cc4e852387b21d003c6d2abbe87e3d92d40412c9d544eb2c2bc65f41ae9e9a94a5e1eec58c3

data/exe/pod_builder

@@ -76,8 +76,8 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-a", "--auto-resolve-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
-          OPTIONS[:auto_resolve_dependencies] = o
+        opts.on("-r", "--parent-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_parent_dependencies] = true
         end
         opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
           OPTIONS[:no_stdin_available] = o
@@ -282,7 +282,7 @@ Usage:
         opts.banner = "
 Usage:
         
-    $ pod_builder switch [OPTIONS] PODNAME[s]
+    $ pod_builder switch [OPTIONS] <PODNAME...>
 
       Switch integration between prebuilt/development/default pod version. Multiple space separated pods can be passed
         
@@ -297,8 +297,14 @@ Options:
         opts.on("-s", "--default", "Default version specified in PodBuilder-Podfile") do |o|
           OPTIONS[:switch_mode] = "default"
         end
-        opts.on("-a", "--all", "Include dependencies") do |o|
-          OPTIONS[:switch_all] = true
+        opts.on("-c", "--child-deps", "Include dependencies of the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_child_dependencies] = true
+        end
+        opts.on("-r", "--parent-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_parent_dependencies] = true
+        end
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update (only when passing --parent-deps") do |o|
+          OPTIONS[:update_repos] = false
         end
       end,
       :call => [        

data/lib/pod_builder/command/build.rb

@@ -73,7 +73,9 @@ module PodBuilder
 
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
 
-        unless install_using_frameworks
+        if install_using_frameworks
+          raise "\n\nOnly static library packaging currently supported for react native projects. Please remove 'use_frameworks!' in #{PodBuilder::basepath("Podfile")}".red if Configuration.react_native_project
+        else
           prepare_defines_modules_override(all_buildable_items)
         end
         
@@ -162,7 +164,7 @@ module PodBuilder
       end
 
       def self.check_not_building_development_pods(pods)
-        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false && Configuration.react_native_project == false)
           pod_names = development_pods.map(&:name).join(", ")
           raise "\n\nThe following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n".red
         end
@@ -199,7 +201,7 @@ module PodBuilder
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
-        if OPTIONS[:auto_resolve_dependencies]
+        if OPTIONS[:resolve_parent_dependencies]
           dependencies = []
           buildable_items.each do |pod|
             if !(pod.dependencies(buildable_items) & pods_to_build).empty?

data/lib/pod_builder/command/switch.rb

@@ -24,8 +24,29 @@ module PodBuilder
           pod_names_to_switch.push(pod_name_to_switch)
         end
 
+        if OPTIONS[:resolve_parent_dependencies] == true
+          install_update_repo = OPTIONS.fetch(:update_repos, true)
+          installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
+  
+          all_buildable_items = Analyze.podfile_items(installer, analyzer)
+
+          pod_names_to_switch.each do |pod_name|
+            if pod = (all_buildable_items.detect { |t| t.name == pod_name } || all_buildable_items.detect { |t| t.root_name == pod_name })
+              dependencies = []
+              all_buildable_items.each do |pod|
+                if !(pod.dependency_names & pod_names_to_switch).empty?
+                  dependencies.push(pod.root_name)
+                end
+              end
+              pod_names_to_switch += dependencies
+            end
+          end
+
+          pod_names_to_switch.uniq!
+        end
+
         dep_pod_names_to_switch = []
-        if OPTIONS[:switch_all] == true
+        if OPTIONS[:resolve_child_dependencies] == true
           pod_names_to_switch.each do |pod|
             podspec_path = PodBuilder::prebuiltpath("#{pod}/#{pod}.podspec")
             unless File.exist?(podspec_path)

data/lib/pod_builder/command/update.rb

@@ -35,7 +35,7 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        # OPTIONS[:auto_resolve_dependencies] = true
+        # OPTIONS[:resolve_parent_dependencies] = true
         return PodBuilder::Command::Build.call
       end              
     end

data/lib/pod_builder/podfile.rb

@@ -395,7 +395,7 @@ module PodBuilder
       target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
       if target_settings.count == 1
         if target_settings.first == false && ENV["DEBUGGING"].nil?
-          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
+          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at root level (not nested in targets) in #{PodBuilder::basepath("Podfile")}".red
         end
         return target_settings.first
       elsif target_settings.count > 1

data/lib/pod_builder/rome/post_install.rb

@@ -328,7 +328,10 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
         file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
         files += file_accessor.vendored_libraries
         files += file_accessor.vendored_frameworks
-        files += file_accessor.resources
+        begin
+          files += file_accessor.resources
+        rescue
+        end
 
         FileUtils.mkdir_p(destination)        
         files.each do |file|

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.34"
+  VERSION = "2.0.0.beta.35"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.34
+  version: 2.0.0.beta.35
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler