Commit e0a5b2f9 authored by Samuel Giddins's avatar Samuel Giddins

[RuboCop] Fix violations

parent ab4858d7
...@@ -13,7 +13,7 @@ module Pod ...@@ -13,7 +13,7 @@ module Pod
attr_reader :headers attr_reader :headers
Header = Struct.new(:path, :umbrella, :private, :textual, :size, :mtime) do Header = Struct.new(:path, :umbrella, :private, :textual, :size, :mtime) do
alias private? private alias_method :private?, :private
def to_s def to_s
[ [
(:private if private?), (:private if private?),
...@@ -22,14 +22,14 @@ module Pod ...@@ -22,14 +22,14 @@ module Pod
'header', 'header',
%("#{path}"), %("#{path}"),
attrs, attrs,
].compact.join(' ') ].compact.join(' ')
end end
def attrs def attrs
attrs = { attrs = {
'size' => size, 'size' => size,
'mtime' => mtime, 'mtime' => mtime,
}.reject {|k,v| v.nil? } }.reject { |_k, v| v.nil? }
return nil if attrs.empty? return nil if attrs.empty?
attrs.to_s attrs.to_s
end end
......
...@@ -101,7 +101,6 @@ module Pod ...@@ -101,7 +101,6 @@ module Pod
settings['SWIFT_VERSION'] = target.swift_version settings['SWIFT_VERSION'] = target.swift_version
end end
settings settings
end end
...@@ -702,14 +701,14 @@ module Pod ...@@ -702,14 +701,14 @@ module Pod
ditto "${PODS_ROOT}/#{target.module_map_path.relative_path_from(target.sandbox.root)}" "${MODULE_MAP_PATH}" ditto "${PODS_ROOT}/#{target.module_map_path.relative_path_from(target.sandbox.root)}" "${MODULE_MAP_PATH}"
printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n header \\"${COMPATIBILITY_HEADER_PATH}\\"\\n requires objc\\n}\\n" >> "${MODULE_MAP_PATH}" printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n header \\"${COMPATIBILITY_HEADER_PATH}\\"\\n requires objc\\n}\\n" >> "${MODULE_MAP_PATH}"
SH SH
build_phase.input_paths = %W[ build_phase.input_paths = %W(
${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h ${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h
${PODS_ROOT}/#{target.module_map_path.relative_path_from(target.sandbox.root)} ${PODS_ROOT}/#{target.module_map_path.relative_path_from(target.sandbox.root)}
] )
build_phase.output_paths = %W[ build_phase.output_paths = %w(
${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap ${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap
${BUILT_PRODUCTS_DIR}/Swift\ Compatibility\ Header/${PRODUCT_MODULE_NAME}-Swift.h ${BUILT_PRODUCTS_DIR}/Swift\ Compatibility\ Header/${PRODUCT_MODULE_NAME}-Swift.h
] )
end end
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
...@@ -75,7 +75,7 @@ module Pod ...@@ -75,7 +75,7 @@ module Pod
# #
def custom_build_settings def custom_build_settings
settings = { settings = {
'PRODUCT_NAME' => target.product_module_name 'PRODUCT_NAME' => target.product_module_name,
} }
unless target.archs.empty? unless target.archs.empty?
......
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