cocoapods 1.3.1 → 1.4.0.beta.1

data/lib/cocoapods/target.rb

@@ -72,7 +72,7 @@ module Pod
     #         #requires_frameworks?.
     #
     def product_type
-      requires_frameworks? ? :framework : :static_library
+      requires_frameworks? && !static_framework? ? :framework : :static_library
     end
 
     # @return [String] A string suitable for debugging.
@@ -90,6 +90,12 @@ module Pod
       host_requires_frameworks? || false
     end
 
+    # @return [Boolean] Whether the target should build a static framework.
+    #
+    def static_framework?
+      !is_a?(Pod::AggregateTarget) && specs.any? && specs.all?(&:static_framework)
+    end
+
     #-------------------------------------------------------------------------#
 
     # @!group Information storage

data/lib/cocoapods/target/aggregate_target.rb

@@ -194,7 +194,7 @@ module Pod
           relevant_pod_targets = pod_targets.select do |pod_target|
             pod_target.include_in_build_config?(target_definition, config)
           end
-          framework_paths_by_config[config] = relevant_pod_targets.flat_map(&:framework_paths)
+          framework_paths_by_config[config] = relevant_pod_targets.flat_map { |pt| pt.framework_paths(false) }
         end
         framework_paths_by_config
       end
@@ -210,7 +210,7 @@ module Pod
         user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
           resources_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
             next [] unless pod_target.include_in_build_config?(target_definition, config)
-            (pod_target.resource_paths + [bridge_support_file].compact).uniq
+            (pod_target.resource_paths(false) + [bridge_support_file].compact).uniq
           end
         end
       end

data/lib/cocoapods/target/pod_target.rb

@@ -197,51 +197,73 @@ module Pod
       specs.select(&:test_specification?).map(&:test_type).uniq
     end
 
+    # Returns the framework paths associated with this target. By default all paths include the framework paths
+    # that are part of test specifications.
+    #
+    # @param  [Boolean] include_test_spec_paths
+    #         Whether to include framework paths from test specifications or not.
+    #
     # @return [Array<Hash{Symbol => [String]}>] The vendored and non vendored framework paths
     #         this target depends upon.
     #
-    def framework_paths
-      @framework_paths ||= begin
-        frameworks = []
-        file_accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
-          relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
-          framework = { :name => framework_path.basename.to_s,
-                        :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
-                        :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
-          # Until this can be configured, assume the dSYM file uses the file name as the framework.
-          # See https://github.com/CocoaPods/CocoaPods/issues/1698
-          dsym_name = "#{framework_path.basename}.dSYM"
-          dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
-          if dsym_path.exist?
-            framework[:dsym_name] = dsym_name
-            framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
-            framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
+    def framework_paths(include_test_spec_paths = true)
+      @framework_paths ||= Hash.new do |h, key|
+        h[key] = begin
+          accessors = file_accessors
+          accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
+          frameworks = []
+          accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
+            relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
+            framework = { :name => framework_path.basename.to_s,
+                          :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
+                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
+            # Until this can be configured, assume the dSYM file uses the file name as the framework.
+            # See https://github.com/CocoaPods/CocoaPods/issues/1698
+            dsym_name = "#{framework_path.basename}.dSYM"
+            dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
+            if dsym_path.exist?
+              framework[:dsym_name] = dsym_name
+              framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
+              framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
+            end
+            frameworks << framework
           end
-          frameworks << framework
-        end
-        if should_build? && requires_frameworks?
-          frameworks << { :name => product_name,
-                          :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
-                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
+          if should_build? && requires_frameworks? && !static_framework?
+            frameworks << { :name => product_name,
+                            :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
+                            :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
+          end
+          frameworks
         end
-        frameworks
       end
+      @framework_paths[include_test_spec_paths]
     end
 
+    # Returns the resource paths associated with this target. By default all paths include the resource paths
+    # that are part of test specifications.
+    #
+    # @param  [Boolean] include_test_spec_paths
+    #         Whether to include resource paths from test specifications or not.
+    #
     # @return [Array<String>] The resource and resource bundle paths this target depends upon.
     #
-    def resource_paths
-      @resource_paths ||= begin
-        resource_paths = file_accessors.flat_map do |accessor|
-          accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
-        end
-        resource_bundles = file_accessors.flat_map do |accessor|
-          prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
-          prefix = configuration_build_dir unless accessor.spec.test_specification?
-          accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
+    def resource_paths(include_test_spec_paths = true)
+      @resource_paths ||= Hash.new do |h, key|
+        h[key] = begin
+          accessors = file_accessors
+          accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
+          resource_paths = accessors.flat_map do |accessor|
+            accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
+          end
+          resource_bundles = accessors.flat_map do |accessor|
+            prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
+            prefix = configuration_build_dir unless accessor.spec.test_specification?
+            accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
+          end
+          resource_paths + resource_bundles
         end
-        resource_paths + resource_bundles
       end
+      @resource_paths[include_test_spec_paths]
     end
 
     # Returns the corresponding native target to use based on the provided specification.
@@ -249,7 +271,7 @@ module Pod
     # test native targets.
     #
     # @param  [Specification] spec
-    #         The specifcation to base from in order to find the native target.
+    #         The specification to base from in order to find the native target.
     #
     # @return [PBXNativeTarget] the native target to use or `nil` if none is found.
     #

data/lib/cocoapods/validator.rb

@@ -14,6 +14,10 @@ module Pod
   class Validator
     include Config::Mixin
 
+    # The default version of Swift to use when linting pods
+    #
+    DEFAULT_SWIFT_VERSION = '3.0'.freeze
+
     # @return [Specification::Linter] the linter instance from CocoaPods
     #         Core.
     #
@@ -252,7 +256,12 @@ module Pod
     # @return [String] the SWIFT_VERSION to use for validation.
     #
     def swift_version
-      @swift_version ||= dot_swift_version || '3.0'
+      return @swift_version if defined?(@swift_version)
+      if version = dot_swift_version
+        @swift_version = version
+      else
+        DEFAULT_SWIFT_VERSION
+      end
     end
 
     # Set the SWIFT_VERSION that should be used to validate the pod.
@@ -386,7 +395,7 @@ module Pod
     end
 
     def validate_dot_swift_version
-      if !used_swift_version.nil? && dot_swift_version.nil?
+      if !used_swift_version.nil? && @swift_version.nil?
         warning(:swift_version,
                 'The validator for Swift projects uses ' \
                 'Swift 3.0 by default, if you are using a different version of ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -193,21 +193,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'