Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: CocoaPods/CocoaPods
...
head fork: CocoaPods/CocoaPods
Checking mergeability… Don't worry, you can still create the pull request.
  • 13 commits
  • 13 files changed
  • 0 commit comments
  • 3 contributors
View
10 .travis.yml
@@ -5,5 +5,15 @@ rvm:
# Rubinius in 1.8 mode on Travis does not work. It complains about st_data_t etc in Xcodeproj.
#- rbx-18mode
- rbx-19mode
+matrix:
+ allow_failures:
+ - rvm: rbx-19mode
install: NOEXEC=skip rake travis:setup
script: bundle exec rake spec
+notifications:
+ # email: false
+ campfire:
+ on_success: change
+ on_failure: always
+ rooms:
+ - secure: "qOE5zmgaHe/qQu3W9rmj7wygA5Ivl+cx50fqWGag2bdRl8ly5yj1NVoOKk/O\nZmQc4Lze+301uvTXi+r5v8A/tF6W1kUZw7yBiKuXoYFUGmDiVR9o2I/FPwkL\ngSzPJttrXTQfkQ4PbnrkX+JO+5bLWrKaO0hKXT4B2yUu4UXLVk0="
View
24 CHANGELOG.md
@@ -1,16 +1,32 @@
-## Master
+## 0.16.0.rc3
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc2...0.16.0.rc3) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0.rc1...0.4.0.rc6)
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc2...master) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0.rc1...master)
+###### Enhancements
-## 0.16.0.rc2
+- Added support for copying frameworks to the app bundle.
+ [#597](https://github.com/CocoaPods/CocoaPods/pull/597)
+
+###### Bug fixes
+
+- Ignore PBXReferenceProxy while integrating into user project.
+ [#626](https://github.com/CocoaPods/CocoaPods/issues/626)
+- Added support for PBXAggregateTarget and PBXLegacyTarget.
+ [#615](https://github.com/CocoaPods/CocoaPods/issues/615)
+- Added support for PBXReferenceProxy.
+ [#612](https://github.com/CocoaPods/CocoaPods/issues/612)
+## 0.16.0.rc2
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc1...0.16.0.rc2)
+
+###### Bug fixes
+
- Fix for uninitialized constant Xcodeproj::Constants error.
## 0.16.0.rc1
-
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.2...0.16.0.rc1) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.5...0.4.0.rc1)
+###### Enhancements
+
- Xcodeproj partial rewrite.
[#565](https://github.com/CocoaPods/CocoaPods/issues/565)
[#561](https://github.com/CocoaPods/CocoaPods/pull/561)
View
14 Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: git://github.com/CocoaPods/Xcodeproj.git
- revision: cc71c669a05934886c56169bbe209014a7a1af8e
+ revision: 916f1f72c6a05b71204ad64f0b29fe3596bd2ed9
specs:
- xcodeproj (0.4.0.rc1)
+ xcodeproj (0.4.0.rc6)
activesupport (~> 3.2.6)
colored (~> 1.2)
@@ -18,7 +18,7 @@ GIT
PATH
remote: .
specs:
- cocoapods (0.16.0.rc2)
+ cocoapods (0.16.0.rc3)
activesupport (~> 3.2.6)
colored (~> 1.2)
escape (~> 0.0.4)
@@ -27,7 +27,7 @@ PATH
octokit (~> 1.7)
open4 (~> 1.3.0)
rake (~> 0.9.0)
- xcodeproj (~> 0.4.0.rc1)
+ xcodeproj (~> 0.4.0.rc6)
GEM
remote: http://rubygems.org/
@@ -44,7 +44,7 @@ GEM
escape (0.0.4)
faraday (0.8.4)
multipart-post (~> 1.1)
- faraday_middleware (0.8.8)
+ faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
github-markup (0.7.4)
hashie (1.2.0)
@@ -57,7 +57,7 @@ GEM
metaclass (~> 0.0.1)
mocha-on-bacon (0.2.1)
mocha (>= 0.9.8)
- multi_json (1.3.6)
+ multi_json (1.3.7)
multipart-post (1.1.5)
octokit (1.18.0)
addressable (~> 2.2)
@@ -75,7 +75,7 @@ GEM
redcarpet (2.2.2)
slop (3.3.3)
terminal-notifier (1.4.2)
- vcr (2.2.5)
+ vcr (2.3.0)
webmock (1.8.11)
addressable (>= 2.2.7)
crack (>= 0.1.7)
View
2  cocoapods.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.executables = %w{ pod }
s.require_paths = %w{ lib }
- s.add_runtime_dependency 'xcodeproj', '~> 0.4.0.rc1'
+ s.add_runtime_dependency 'xcodeproj', '~> 0.4.0.rc6'
s.add_runtime_dependency 'faraday', '~> 0.8.1'
s.add_runtime_dependency 'octokit', '~> 1.7'
View
2  lib/cocoapods.rb
@@ -12,7 +12,7 @@
end
module Pod
- VERSION = '0.16.0.rc2'
+ VERSION = '0.16.0.rc3'
class PlainInformative < StandardError
end
View
4 lib/cocoapods/generator/copy_resources_script.rb
@@ -15,6 +15,10 @@ class CopyResourcesScript
echo "ibtool --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
ibtool --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
;;
+ *.framework)
+ echo "rsync -rp ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+ rsync -rp "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+ ;;
*)
echo "cp -R ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
cp -R "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
View
5 lib/cocoapods/installer/user_project_integrator.rb
@@ -138,7 +138,10 @@ def targets
[user_project.targets.first]
end.reject do |target|
# Reject any target that already has this Pods library in one of its frameworks build phases
- target.frameworks_build_phase.files.any? { |build_file| build_file.file_ref.name == @target_definition.lib_name }
+ target.frameworks_build_phase.files.any? do |build_file|
+ file_ref = build_file.file_ref
+ !file_ref.proxy? && file_ref.name == @target_definition.lib_name
+ end
end
end
end
View
242 spec/fixtures/SampleProject/Sample Lib/Sample Lib.xcodeproj/project.pbxproj
@@ -0,0 +1,242 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 51E94E13164472080035348C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E94E12164472080035348C /* Foundation.framework */; };
+ 51E94E18164472090035348C /* Sample_Lib.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 51E94E17164472090035348C /* Sample_Lib.h */; };
+ 51E94E1A164472090035348C /* Sample_Lib.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E94E19164472090035348C /* Sample_Lib.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ 51E94E0D164472080035348C /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "include/${PRODUCT_NAME}";
+ dstSubfolderSpec = 16;
+ files = (
+ 51E94E18164472090035348C /* Sample_Lib.h in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ 51E94E0F164472080035348C /* libSample Lib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSample Lib.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 51E94E12164472080035348C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ 51E94E16164472090035348C /* Sample Lib-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Sample Lib-Prefix.pch"; sourceTree = "<group>"; };
+ 51E94E17164472090035348C /* Sample_Lib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Sample_Lib.h; sourceTree = "<group>"; };
+ 51E94E19164472090035348C /* Sample_Lib.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Sample_Lib.m; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 51E94E0C164472080035348C /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 51E94E13164472080035348C /* Foundation.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 51E94E04164472080035348C = {
+ isa = PBXGroup;
+ children = (
+ 51E94E14164472090035348C /* Sample Lib */,
+ 51E94E11164472080035348C /* Frameworks */,
+ 51E94E10164472080035348C /* Products */,
+ );
+ sourceTree = "<group>";
+ };
+ 51E94E10164472080035348C /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 51E94E0F164472080035348C /* libSample Lib.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 51E94E11164472080035348C /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 51E94E12164472080035348C /* Foundation.framework */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+ 51E94E14164472090035348C /* Sample Lib */ = {
+ isa = PBXGroup;
+ children = (
+ 51E94E17164472090035348C /* Sample_Lib.h */,
+ 51E94E19164472090035348C /* Sample_Lib.m */,
+ 51E94E15164472090035348C /* Supporting Files */,
+ );
+ path = "Sample Lib";
+ sourceTree = "<group>";
+ };
+ 51E94E15164472090035348C /* Supporting Files */ = {
+ isa = PBXGroup;
+ children = (
+ 51E94E16164472090035348C /* Sample Lib-Prefix.pch */,
+ );
+ name = "Supporting Files";
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 51E94E0E164472080035348C /* Sample Lib */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 51E94E1D164472090035348C /* Build configuration list for PBXNativeTarget "Sample Lib" */;
+ buildPhases = (
+ 51E94E0B164472080035348C /* Sources */,
+ 51E94E0C164472080035348C /* Frameworks */,
+ 51E94E0D164472080035348C /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "Sample Lib";
+ productName = "Sample Lib";
+ productReference = 51E94E0F164472080035348C /* libSample Lib.a */;
+ productType = "com.apple.product-type.library.static";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 51E94E06164472080035348C /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0450;
+ ORGANIZATIONNAME = CocoaPods;
+ };
+ buildConfigurationList = 51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = 51E94E04164472080035348C;
+ productRefGroup = 51E94E10164472080035348C /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 51E94E0E164472080035348C /* Sample Lib */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 51E94E0B164472080035348C /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 51E94E1A164472090035348C /* Sample_Lib.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ 51E94E1B164472090035348C /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ SDKROOT = iphoneos;
+ };
+ name = Debug;
+ };
+ 51E94E1C164472090035348C /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ SDKROOT = iphoneos;
+ VALIDATE_PRODUCT = YES;
+ };
+ name = Release;
+ };
+ 51E94E1E164472090035348C /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ DSTROOT = /tmp/Sample_Lib.dst;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Sample Lib/Sample Lib-Prefix.pch";
+ OTHER_LDFLAGS = "-ObjC";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ };
+ name = Debug;
+ };
+ 51E94E1F164472090035348C /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ DSTROOT = /tmp/Sample_Lib.dst;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Sample Lib/Sample Lib-Prefix.pch";
+ OTHER_LDFLAGS = "-ObjC";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 51E94E1B164472090035348C /* Debug */,
+ 51E94E1C164472090035348C /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 51E94E1D164472090035348C /* Build configuration list for PBXNativeTarget "Sample Lib" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 51E94E1E164472090035348C /* Debug */,
+ 51E94E1F164472090035348C /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 51E94E06164472080035348C /* Project object */;
+}
View
7 spec/fixtures/SampleProject/Sample Lib/Sample Lib/Sample Lib-Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'Sample Lib' target in the 'Sample Lib' project
+//
+
+#ifdef __OBJC__
+ #import <Foundation/Foundation.h>
+#endif
View
13 spec/fixtures/SampleProject/Sample Lib/Sample Lib/Sample_Lib.h
@@ -0,0 +1,13 @@
+//
+// Sample_Lib.h
+// Sample Lib
+//
+// Created by Eloy Durán on 11/2/12.
+// Copyright (c) 2012 CocoaPods. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface Sample_Lib : NSObject
+
+@end
View
13 spec/fixtures/SampleProject/Sample Lib/Sample Lib/Sample_Lib.m
@@ -0,0 +1,13 @@
+//
+// Sample_Lib.m
+// Sample Lib
+//
+// Created by Eloy Durán on 11/2/12.
+// Copyright (c) 2012 CocoaPods. All rights reserved.
+//
+
+#import "Sample_Lib.h"
+
+@implementation Sample_Lib
+
+@end
View
38 spec/fixtures/SampleProject/SampleProject.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
51075D541521D0C100E39B41 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 51075D521521D0C100E39B41 /* InfoPlist.strings */; };
51075D561521D0C100E39B41 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 51075D551521D0C100E39B41 /* main.m */; };
51075D5A1521D0C100E39B41 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 51075D591521D0C100E39B41 /* AppDelegate.m */; };
+ 51E94E2A1644722C0035348C /* libSample Lib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E94E28164472200035348C /* libSample Lib.a */; };
A346497214F9BE9A0080D870 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497114F9BE9A0080D870 /* UIKit.framework */; };
A346497414F9BE9A0080D870 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497314F9BE9A0080D870 /* Foundation.framework */; };
A346497614F9BE9A0080D870 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497514F9BE9A0080D870 /* CoreGraphics.framework */; };
@@ -21,6 +22,16 @@
A346498214F9BE9A0080D870 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A346498114F9BE9A0080D870 /* AppDelegate.m */; };
/* End PBXBuildFile section */
+/* Begin PBXContainerItemProxy section */
+ 51E94E27164472200035348C /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 51E94E0F164472080035348C;
+ remoteInfo = "Sample Lib";
+ };
+/* End PBXContainerItemProxy section */
+
/* Begin PBXFileReference section */
51075D4A1521D0C100E39B41 /* TestRunner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestRunner.app; sourceTree = BUILT_PRODUCTS_DIR; };
51075D511521D0C100E39B41 /* TestRunner-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestRunner-Info.plist"; sourceTree = "<group>"; };
@@ -29,6 +40,7 @@
51075D571521D0C100E39B41 /* TestRunner-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TestRunner-Prefix.pch"; sourceTree = "<group>"; };
51075D581521D0C100E39B41 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
51075D591521D0C100E39B41 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+ 51E94E201644721F0035348C /* Sample Lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Sample Lib.xcodeproj"; path = "Sample Lib/Sample Lib.xcodeproj"; sourceTree = "<group>"; };
A346496D14F9BE9A0080D870 /* SampleProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
A346497114F9BE9A0080D870 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
A346497314F9BE9A0080D870 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -56,6 +68,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 51E94E2A1644722C0035348C /* libSample Lib.a in Frameworks */,
A346497214F9BE9A0080D870 /* UIKit.framework in Frameworks */,
A346497414F9BE9A0080D870 /* Foundation.framework in Frameworks */,
A346497614F9BE9A0080D870 /* CoreGraphics.framework in Frameworks */,
@@ -86,9 +99,18 @@
name = "Supporting Files";
sourceTree = "<group>";
};
+ 51E94E211644721F0035348C /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 51E94E28164472200035348C /* libSample Lib.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
A346496214F9BE990080D870 = {
isa = PBXGroup;
children = (
+ 51E94E201644721F0035348C /* Sample Lib.xcodeproj */,
A346497714F9BE9A0080D870 /* SampleProject */,
51075D4F1521D0C100E39B41 /* TestRunner */,
A346497014F9BE9A0080D870 /* Frameworks */,
@@ -192,6 +214,12 @@
mainGroup = A346496214F9BE990080D870;
productRefGroup = A346496E14F9BE9A0080D870 /* Products */;
projectDirPath = "";
+ projectReferences = (
+ {
+ ProductGroup = 51E94E211644721F0035348C /* Products */;
+ ProjectRef = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
+ },
+ );
projectRoot = "";
targets = (
A346496C14F9BE9A0080D870 /* SampleProject */,
@@ -200,6 +228,16 @@
};
/* End PBXProject section */
+/* Begin PBXReferenceProxy section */
+ 51E94E28164472200035348C /* libSample Lib.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libSample Lib.a";
+ remoteRef = 51E94E27164472200035348C /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+/* End PBXReferenceProxy section */
+
/* Begin PBXResourcesBuildPhase section */
51075D481521D0C100E39B41 /* Resources */ = {
isa = PBXResourcesBuildPhase;
View
4 spec/functional/user_project_integrator_spec.rb
@@ -69,7 +69,9 @@ def integrate!
it 'adds the libPods static library to the "Link binary with libraries" build phase of each target' do
@podfile.target_definitions.each do |_, definition|
target = @sample_project.targets.find { |t| t.name == definition.link_with.first }
- target.frameworks_build_phase.files.find { |f| f.file_ref.name == definition.lib_name}.should.not == nil
+ target.frameworks_build_phase.files.find do |bf|
+ !bf.file_ref.proxy? && bf.file_ref.name == definition.lib_name
+ end.should.not == nil
end
end

No commit comments for this range

Something went wrong with that request. Please try again.