Commit 6e69aff6 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Installer] Allow disabling default plugins

[Validator] Disable default plugins when installing
parent 08d3a04b
...@@ -67,6 +67,8 @@ module Pod ...@@ -67,6 +67,8 @@ module Pod
@sandbox = sandbox @sandbox = sandbox
@podfile = podfile @podfile = podfile
@lockfile = lockfile @lockfile = lockfile
@use_default_plugins = true
end end
# @return [Hash, Boolean, nil] Pods that have been requested to be # @return [Hash, Boolean, nil] Pods that have been requested to be
...@@ -76,6 +78,12 @@ module Pod ...@@ -76,6 +78,12 @@ module Pod
# #
attr_accessor :update attr_accessor :update
# @return [Boolean] Whether default plugins should be used during
# installation. Defaults to true.
#
attr_accessor :use_default_plugins
alias_method :use_default_plugins?, :use_default_plugins
# Installs the Pods. # Installs the Pods.
# #
# The installation process is mostly linear with a few minor complications # The installation process is mostly linear with a few minor complications
...@@ -461,7 +469,11 @@ module Pod ...@@ -461,7 +469,11 @@ module Pod
# @return [Hash<String, Hash>] The plugins to be used # @return [Hash<String, Hash>] The plugins to be used
# #
def plugins def plugins
if use_default_plugins?
DEFAULT_PLUGINS.merge(podfile.plugins) DEFAULT_PLUGINS.merge(podfile.plugins)
else
podfile.plugins
end
end end
# Prints a warning for any pods that are deprecated # Prints a warning for any pods that are deprecated
......
...@@ -342,6 +342,7 @@ module Pod ...@@ -342,6 +342,7 @@ module Pod
podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks) podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks)
sandbox = Sandbox.new(config.sandbox_root) sandbox = Sandbox.new(config.sandbox_root)
installer = Installer.new(sandbox, podfile) installer = Installer.new(sandbox, podfile)
installer.use_default_plugins = false
installer.install! installer.install!
file_accessors = installer.aggregate_targets.map do |target| file_accessors = installer.aggregate_targets.map do |target|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment