cocoapods 1.4.0.beta.1 → 1.4.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd89248d652b96a2bc808fb3ee21df39d3478f0
-  data.tar.gz: 54a96361eb879bb08e1a094032450fa33b84af37
+  metadata.gz: 435d85f5f3ea7e2924e657bc8a5511dc477ea0be
+  data.tar.gz: 880a615bf2c28d75295a0e1b6117e1451c696724
 SHA512:
-  metadata.gz: 51657c926930d550992f2463cc1c26b679b8fefb6daaa86e7c83988eb6967ab43792b7c10fe39f58068e205639b6e628d12541094953aee91e9e0adf1290ffd9
-  data.tar.gz: e52fe2eb2101c6bdbadd571a77bc6b845b1992b923c5c9ed2a5380990ad94994c4f95d039eda866a3df15ef2045ca49e13e723cbdf47d91534e6994a56beedf6
+  metadata.gz: 72ed25c0b7a5faab93b0f6576f82db05981206cdeda385f00751bbe4011f512cb1a57be9d9f927211a4833bd641601b3e199fb28dda834fe11db270cdbbcf9ce
+  data.tar.gz: 086ff09352aa6face50b22e8a8910a22c34c38141a7dc11d6e426bc749876082951d5d07ac4675f8d9ca8e85f74febe128ca63c19aa0b6a7b9d5912673778f91

data/CHANGELOG.md

@@ -4,6 +4,85 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.4.0.beta.2 (2017-10-24)
+
+##### Enhancements
+
+* Integrate execution position for shell script phases  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7101](https://github.com/CocoaPods/CocoaPods/pull/7101)
+
+* Add support to integrate script phases from podspecs  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7092](https://github.com/CocoaPods/CocoaPods/pull/7092)
+
+* Add support for preventing pch file generation with the skip_pch podspec attribute  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7044](https://github.com/CocoaPods/CocoaPods/pull/7044)
+
+* Add app host support for test specs  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6953](https://github.com/CocoaPods/CocoaPods/issues/6953)
+
+* Add support for resources in source static library frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7100](https://github.com/CocoaPods/CocoaPods/pull/7100)
+
+##### Bug Fixes
+
+* Copy .swiftmodule into static_frameworks to enable access to Swift static frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7140](https://github.com/CocoaPods/CocoaPods/issues/7140)
+
+* Fix docs for prefix header paths  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7149](https://github.com/CocoaPods/CocoaPods/pull/7149)
+
+* Fix integration `prefix_header_file` with test specs  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7147](https://github.com/CocoaPods/CocoaPods/pull/7147)
+
+* Set the default Swift version to 3.2 during validation  
+  [Victor Hugo Barros](https://github.com/heyzooi)
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7136](https://github.com/CocoaPods/CocoaPods/pull/7136)
+
+* Better warning message for which Swift version was used during validation  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7121](https://github.com/CocoaPods/CocoaPods/issues/7121)
+
+* Fix static_framework Swift pod dependencies and implement pod access to dependent vendored_framework modules  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7117](https://github.com/CocoaPods/CocoaPods/issues/7117)
+
+* Strip vendored dSYMs during embed script phase  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7111](https://github.com/CocoaPods/CocoaPods/issues/7111)
+
+* Warn when a pod that was added or changed includes script phases  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7110](https://github.com/CocoaPods/CocoaPods/pull/7110)
+
+* Build pod targets with script phases and integrate them properly  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7104](https://github.com/CocoaPods/CocoaPods/pull/7104)
+
+* Do not set a `CODE_SIGN_IDENTITY` for macOS app hosts or xctest bundles
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7103](https://github.com/CocoaPods/CocoaPods/pull/7103)
+
+* Fix framework and resources paths caching  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7068](https://github.com/CocoaPods/CocoaPods/pull/7068)
+
+* Build subspecs in static frameworks without error  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7058](https://github.com/CocoaPods/CocoaPods/pull/7058)
+
+* Ensure `SYMROOT` is properly set for all user configurations  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7081](https://github.com/CocoaPods/CocoaPods/issues/7081)
+
 ## 1.4.0.beta.1 (2017-09-24)
 
 ##### Enhancements
@@ -29,7 +108,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [#6969](https://github.com/CocoaPods/CocoaPods/pull/6969)
 
 * For source static frameworks, include frameworks from dependent targets and libraries in OTHER_LDFLAGS  
-  [paulb777](https://github.com/paulb777)
+  [Paul Beusterien](https://github.com/paulb777)
   [#6988](https://github.com/CocoaPods/CocoaPods/pull/6988)
 
 ##### Bug Fixes
@@ -85,7 +164,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 * Fix validation warnings when using --swift-version  
   [Danielle Tomlinson](https://github.com/dantoml)
-  [#6971](https://github.com/CocoaPods/CocoaPods/issue/6971)
+  [#6971](https://github.com/CocoaPods/CocoaPods/pull/6971)
 
 * Fix xcconfig boolean merging when substrings include yes or no  
   [Paul Beusterien](https://github.com/paulb777)

data/lib/cocoapods.rb

@@ -66,6 +66,7 @@ module Pod
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :UmbrellaHeader,          'cocoapods/generator/umbrella_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'
+    autoload :AppTargetHelper,         'cocoapods/generator/app_target_helper'
   end
 
   require 'cocoapods/core_overrides'

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.4.0.beta.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.4.0.beta.2'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/app_target_helper.rb

@@ -0,0 +1,227 @@
+module Pod
+  module Generator
+    # Stores the common logic for creating app targets within projects including
+    # generating standard import and main files for app hosts.
+    #
+    module AppTargetHelper
+      # Adds a single app target to the given project with the provided name.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the target into.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the target. Can be `:ios` or `:osx`, etc.
+      #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
+      # @param  [String] name
+      #         The name to use for the target, defaults to 'App'.
+      #
+      # @return [PBXNativeTarget] the new target that was created.
+      #
+      def self.add_app_target(project, platform, deployment_target, name = 'App')
+        project.new_target(:application, name, platform, deployment_target)
+      end
+
+      # Creates and links an import file for the given pod target and into the given native target.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the target into.
+      #
+      # @param  [PBXNativeTarget] target
+      #         the native target to link the generated import file into.
+      #
+      # @param  [PodTarget] pod_target
+      #         the pod target to use for when generating the contents of the import file.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the target. Can be `:ios` or `:osx`, etc.
+      #
+      # @param  [Boolean] use_frameworks
+      #         whether to use frameworks or not when generating the contents of the import file.
+      #
+      # @param  [String] name
+      #         The name to use for the target, defaults to 'App'.
+      #
+      # @return [Array<PBXBuildFile>] the created build file references.
+      #
+      def self.add_app_project_import(project, target, pod_target, platform, use_frameworks, name = 'App')
+        source_file = AppTargetHelper.create_app_import_source_file(project, pod_target, platform, use_frameworks, name)
+        source_file_ref = project.new_group(name, name).new_file(source_file)
+        target.add_file_references([source_file_ref])
+      end
+
+      # Creates and links a default app host 'main.m' file.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the target into.
+      #
+      # @param  [PBXNativeTarget] target
+      #         the native target to link the generated main file into.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the target. Can be `:ios` or `:osx`, etc.
+      #
+      # @param  [String] name
+      #         The name to use for the target, defaults to 'App'.
+      #
+      # @return [Array<PBXBuildFile>] the created build file references.
+      #
+      def self.add_app_host_main_file(project, target, platform, name = 'App')
+        source_file = AppTargetHelper.create_app_host_main_file(project, platform, name)
+        source_file_ref = project.new_group(name, name).new_file(source_file)
+        target.add_file_references([source_file_ref])
+      end
+
+      # Adds the xctest framework search paths into the given target.
+      #
+      # @param  [PBXNativeTarget] target
+      #         the native target to add XCTest into.
+      #
+      # @return [void]
+      #
+      def self.add_xctest_search_paths(target)
+        target.build_configurations.each do |configuration|
+          search_paths = configuration.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= '$(inherited)'
+          search_paths << ' "$(PLATFORM_DIR)/Developer/Library/Frameworks"'
+        end
+      end
+
+      # Adds the provided swift version into the given target.
+      #
+      # @param  [PBXNativeTarget] target
+      #         the native target to add the swift version into.
+      #
+      # @param  [String] swift_version
+      #         the swift version to set to.
+      #
+      # @return [void]
+      #
+      def self.add_swift_version(target, swift_version)
+        raise 'Cannot set empty Swift version to target.' if swift_version.blank?
+        target.build_configurations.each do |configuration|
+          configuration.build_settings['SWIFT_VERSION'] = swift_version
+        end
+      end
+
+      # Creates a default import file for the given pod target.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the target into.
+      #
+      # @param  [PodTarget] pod_target
+      #         the pod target to use for when generating the contents of the import file.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the target. Can be `:ios` or `:osx`, etc.
+      #
+      # @param  [Boolean] use_frameworks
+      #         whether to use frameworks or not when generating the contents of the import file.
+      #
+      # @param  [String] name
+      #         The name of the folder to use and save the generated main file.
+      #
+      # @return [Pathname] the new source file that was generated.
+      #
+      def self.create_app_import_source_file(project, pod_target, platform, use_frameworks, name = 'App')
+        language = pod_target.uses_swift? ? :swift : :objc
+
+        if language == :swift
+          source_file = project.path.dirname.+("#{name}/main.swift")
+          source_file.parent.mkpath
+          import_statement = use_frameworks && pod_target.should_build? ? "import #{pod_target.product_module_name}\n" : ''
+          source_file.open('w') { |f| f << import_statement }
+        else
+          source_file = project.path.dirname.+("#{name}/main.m")
+          source_file.parent.mkpath
+          import_statement = if use_frameworks && pod_target.should_build?
+                               "@import #{pod_target.product_module_name};\n"
+                             else
+                               header_name = "#{pod_target.product_module_name}/#{pod_target.product_module_name}.h"
+                               if pod_target.sandbox.public_headers.root.+(header_name).file?
+                                 "#import <#{header_name}>\n"
+                               else
+                                 ''
+                               end
+                             end
+          source_file.open('w') do |f|
+            f << "@import Foundation;\n"
+            f << "@import UIKit;\n" if platform == :ios || platform == :tvos
+            f << "@import Cocoa;\n" if platform == :osx
+            f << "#{import_statement}int main() {}\n"
+          end
+        end
+        source_file
+      end
+
+      # Creates a default app host 'main.m' file.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the target into.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the target. Can be `:ios` or `:osx`.
+      #
+      # @param  [String] name
+      #         The name of the folder to use and save the generated main file.
+      #
+      # @return [Pathname] the new source file that was generated.
+      #
+      def self.create_app_host_main_file(project, platform, name = 'App')
+        source_file = project.path.dirname.+("#{name}/main.m")
+        source_file.parent.mkpath
+        source_file.open('w') do |f|
+          case platform
+          when :ios, :tvos
+            f << IOS_APP_HOST_MAIN_CONTENTS
+          when :osx
+            f << MACOS_APP_APP_HOST_MAIN_CONTENTS
+          end
+        end
+        source_file
+      end
+
+      IOS_APP_HOST_MAIN_CONTENTS = <<EOS.freeze
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface CPTestAppHostAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (nonatomic, strong) UIWindow *window;
+
+@end
+
+@implementation CPTestAppHostAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    self.window.rootViewController = [UIViewController new];
+
+    [self.window makeKeyAndVisible];
+
+    return YES;
+}
+
+@end
+
+int main(int argc, char *argv[])
+{
+    @autoreleasepool
+    {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([CPTestAppHostAppDelegate class]));
+    }
+}
+EOS
+
+      MACOS_APP_APP_HOST_MAIN_CONTENTS = <<EOS.freeze
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, const char * argv[]) {
+    return NSApplicationMain(argc, argv);
+}
+EOS
+    end
+  end
+end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -102,6 +102,15 @@ module Pod
               echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
               rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
             fi
+
+            local basename
+            basename="$(basename -s .framework.dSYM "$source")"
+            binary="${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+            # Strip invalid architectures so "fat" simulator / device frameworks work on device
+            if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+              strip_invalid_archs "$binary"
+            fi
           }
 
           # Signs a framework with the provided identity

data/lib/cocoapods/generator/info_plist_file.rb

@@ -5,9 +5,13 @@ module Pod
     # framework. It states public attributes.
     #
     class InfoPlistFile
-      # @return [Target] the target represented by this Info.plist.
+      # @return [Version] version The version to use for when generating this Info.plist file.
       #
-      attr_reader :target
+      attr_reader :version
+
+      # @return [Platform] The platform to use for when generating this Info.plist file.
+      #
+      attr_reader :platform
 
       # @return [Symbol] the CFBundlePackageType of the target this Info.plist
       #         file is for.
@@ -16,12 +20,13 @@ module Pod
 
       # Initialize a new instance
       #
-      # @param  [Target] target @see target
-      #
+      # @param  [Version] version @see version
+      # @param  [Platform] platform @see platform
       # @param  [Symbol] bundle_package_type @see bundle_package_type
       #
-      def initialize(target, bundle_package_type: :fmwk)
-        @target = target
+      def initialize(version, platform, bundle_package_type = :fmwk)
+        @version = version
+        @platform = platform
         @bundle_package_type = bundle_package_type
       end
 
@@ -39,21 +44,6 @@ module Pod
         end
       end
 
-      # The version associated with the current target
-      #
-      # @note Will return 1.0.0 for the AggregateTarget
-      #
-      # @return [String]
-      #
-      def target_version
-        if target && target.respond_to?(:root_spec)
-          version = target.root_spec.version
-          [version.major, version.minor, version.patch].join('.')
-        else
-          '1.0.0'
-        end
-      end
-
       # Generates the contents of the Info.plist
       #
       # @return [String]
@@ -108,7 +98,7 @@ module Pod
           'CFBundleInfoDictionaryVersion' => '6.0',
           'CFBundleName' => '${PRODUCT_NAME}',
           'CFBundlePackageType' => bundle_package_type.to_s.upcase,
-          'CFBundleShortVersionString' => target_version,
+          'CFBundleShortVersionString' => version,
           'CFBundleSignature' => '????',
           'CFBundleVersion' => '${CURRENT_PROJECT_VERSION}',
           'NSPrincipalClass' => '',
@@ -117,6 +107,7 @@ module Pod
 
         info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl
         info['CFBundleVersion'] = '1' if bundle_package_type == :bndl
+        info['NSPrincipalClass'] = 'NSApplication' if bundle_package_type == :appl && platform == :osx
 
         info
       end

data/lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -71,6 +71,7 @@ module Pod
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
           recursive_dependent_targets = target.recursive_dependent_targets
           @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
+          XCConfigHelper.generate_vendored_build_settings(target, recursive_dependent_targets, @xcconfig, false) if target.requires_frameworks?
           if @test_xcconfig
             test_dependent_targets = [target, *target.recursive_test_dependent_targets].uniq
             @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)