Skip to content

C
cocoapods
Commit 0fec0e09 authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub
Browse files
Options

Merge pull request #5637 from benasher44/basher_fix_multi_project_embedded_verification 

Make embedded target host verification consider all known user projects
parents b37777ad 2b4b6cdd
Hide whitespace changes
Inline Side-by-side
Showing with 286 additions and 8 deletions
CHANGELOG.md
View file @ 0fec0e09
...@@ -138,7 +138,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -138,7 +138,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Enhancements ##### Enhancements
* None. * Improve host target detection for embedded targets
in sub-projects.
[Ben Asher](https://github.com/benasher44)
[#5622](https://github.com/CocoaPods/CocoaPods/issues/5622)
##### Bug Fixes ##### Bug Fixes
......
Gemfile.lock
View file @ 0fec0e09
GIT GIT
remote: https://github.com/CocoaPods/CLAide.git remote: https://github.com/CocoaPods/CLAide.git
revision: 74a51d486dd7a12ee798d015385714c13146946d revision: 61071679fc965083b6d43fdc1aa042afbaf172d1
branch: master branch: master
specs: specs:
claide (1.0.0) claide (1.0.0)
...@@ -24,7 +24,7 @@ GIT ...@@ -24,7 +24,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: d3b9b2a2f99fab532c46c1a1fa753edcdc7334c3 revision: 2f8cc93e82df9cb207eca789cdadded02ac9e7a9
branch: master branch: master
specs: specs:
xcodeproj (1.2.0) xcodeproj (1.2.0)
...@@ -116,7 +116,7 @@ PATH ...@@ -116,7 +116,7 @@ PATH
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (4.2.6) activesupport (4.2.7)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
......
lib/cocoapods/installer/analyzer.rb
View file @ 0fec0e09
...@@ -267,10 +267,11 @@ module Pod ...@@ -267,10 +267,11 @@ module Pod
# #
def verify_host_targets_in_podfile(aggregate_targets, embedded_aggregate_targets) def verify_host_targets_in_podfile(aggregate_targets, embedded_aggregate_targets)
aggregate_target_uuids = Set.new aggregate_targets.map(&:user_targets).flatten.map(&:uuid) aggregate_target_uuids = Set.new aggregate_targets.map(&:user_targets).flatten.map(&:uuid)
aggregate_target_user_projects = aggregate_targets.map(&:user_project)
embedded_targets_missing_hosts = [] embedded_targets_missing_hosts = []
embedded_aggregate_targets.each do |target| embedded_aggregate_targets.each do |target|
host_uuids = target.user_targets.map do |user_target| host_uuids = aggregate_target_user_projects.product(target.user_targets).map do |user_project, user_target|
target.user_project.host_targets_for_embedded_target(user_target).map(&:uuid) user_project.host_targets_for_embedded_target(user_target).map(&:uuid)
end.flatten end.flatten
embedded_targets_missing_hosts << target unless host_uuids.any? do |uuid| embedded_targets_missing_hosts << target unless host_uuids.any? do |uuid|
aggregate_target_uuids.include? uuid aggregate_target_uuids.include? uuid
......
spec/fixtures/SampleProject/Sample Lib/Sample Framework/Info.plist 0 → 100644
View file @ 0fec0e09
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
spec/fixtures/SampleProject/Sample Lib/Sample Framework/Sample Framework.h 0 → 100644
View file @ 0fec0e09
//
// Sample Framework.h
// Sample Framework
//
// Created by Benjamin Asher on 7/16/16.
// Copyright © 2016 CocoaPods. All rights reserved.
//
#import <UIKit/UIKit.h>
//! Project version number for Sample Framework.
FOUNDATION_EXPORT double Sample_FrameworkVersionNumber;
//! Project version string for Sample Framework.
FOUNDATION_EXPORT const unsigned char Sample_FrameworkVersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <Sample_Framework/PublicHeader.h>
spec/fixtures/SampleProject/Sample Lib/Sample Framework/Sample.m 0 → 100644
View file @ 0fec0e09
//
// Sample.m
// Sample Lib
//
// Created by Benjamin Asher on 7/16/16.
// Copyright © 2016 CocoaPods. All rights reserved.
//
#import <Foundation/Foundation.h>
spec/fixtures/SampleProject/Sample Lib/Sample Lib.xcodeproj/project.pbxproj
View file @ 0fec0e09
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
137F16161D3AFC2900029696 /* Sample Framework.h in Headers */ = {isa = PBXBuildFile; fileRef = 137F16151D3AFC2900029696 /* Sample Framework.h */; settings = {ATTRIBUTES = (Public, ); }; };
137F161C1D3AFC6700029696 /* Sample.m in Sources */ = {isa = PBXBuildFile; fileRef = 137F161B1D3AFC6700029696 /* Sample.m */; };
51E94E13164472080035348C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E94E12164472080035348C /* Foundation.framework */; }; 51E94E13164472080035348C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E94E12164472080035348C /* Foundation.framework */; };
51E94E18164472090035348C /* Sample_Lib.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 51E94E17164472090035348C /* Sample_Lib.h */; }; 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 */; }; 51E94E1A164472090035348C /* Sample_Lib.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E94E19164472090035348C /* Sample_Lib.m */; };
...@@ -26,6 +28,10 @@ ...@@ -26,6 +28,10 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
137F16131D3AFC2900029696 /* Sample Framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "Sample Framework.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
137F16151D3AFC2900029696 /* Sample Framework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Sample Framework.h"; sourceTree = "<group>"; };
137F16171D3AFC2900029696 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
137F161B1D3AFC6700029696 /* Sample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sample.m; sourceTree = "<group>"; };
51E94E0F164472080035348C /* libSample Lib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSample Lib.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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; }; 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>"; }; 51E94E16164472090035348C /* Sample Lib-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Sample Lib-Prefix.pch"; sourceTree = "<group>"; };
...@@ -34,6 +40,13 @@ ...@@ -34,6 +40,13 @@
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
137F160F1D3AFC2900029696 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
51E94E0C164472080035348C /* Frameworks */ = { 51E94E0C164472080035348C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -45,10 +58,21 @@ ...@@ -45,10 +58,21 @@
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
137F16141D3AFC2900029696 /* Sample Framework */ = {
isa = PBXGroup;
children = (
137F16151D3AFC2900029696 /* Sample Framework.h */,
137F161B1D3AFC6700029696 /* Sample.m */,
137F16171D3AFC2900029696 /* Info.plist */,
);
path = "Sample Framework";
sourceTree = "<group>";
};
51E94E04164472080035348C = { 51E94E04164472080035348C = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
51E94E14164472090035348C /* Sample Lib */, 51E94E14164472090035348C /* Sample Lib */,
137F16141D3AFC2900029696 /* Sample Framework */,
51E94E11164472080035348C /* Frameworks */, 51E94E11164472080035348C /* Frameworks */,
51E94E10164472080035348C /* Products */, 51E94E10164472080035348C /* Products */,
); );
...@@ -58,6 +82,7 @@ ...@@ -58,6 +82,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
51E94E0F164472080035348C /* libSample Lib.a */, 51E94E0F164472080035348C /* libSample Lib.a */,
137F16131D3AFC2900029696 /* Sample Framework.framework */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -90,7 +115,36 @@ ...@@ -90,7 +115,36 @@
}; };
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
137F16101D3AFC2900029696 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
137F16161D3AFC2900029696 /* Sample Framework.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
137F16121D3AFC2900029696 /* Sample Framework */ = {
isa = PBXNativeTarget;
buildConfigurationList = 137F161A1D3AFC2900029696 /* Build configuration list for PBXNativeTarget "Sample Framework" */;
buildPhases = (
137F160E1D3AFC2900029696 /* Sources */,
137F160F1D3AFC2900029696 /* Frameworks */,
137F16101D3AFC2900029696 /* Headers */,
137F16111D3AFC2900029696 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Sample Framework";
productName = "Sample Framework";
productReference = 137F16131D3AFC2900029696 /* Sample Framework.framework */;
productType = "com.apple.product-type.framework";
};
51E94E0E164472080035348C /* Sample Lib */ = { 51E94E0E164472080035348C /* Sample Lib */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 51E94E1D164472090035348C /* Build configuration list for PBXNativeTarget "Sample Lib" */; buildConfigurationList = 51E94E1D164472090035348C /* Build configuration list for PBXNativeTarget "Sample Lib" */;
...@@ -116,6 +170,11 @@ ...@@ -116,6 +170,11 @@
attributes = { attributes = {
LastUpgradeCheck = 0630; LastUpgradeCheck = 0630;
ORGANIZATIONNAME = CocoaPods; ORGANIZATIONNAME = CocoaPods;
TargetAttributes = {
137F16121D3AFC2900029696 = {
CreatedOnToolsVersion = 7.3.1;
};
};
}; };
buildConfigurationList = 51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */; buildConfigurationList = 51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
...@@ -130,11 +189,30 @@ ...@@ -130,11 +189,30 @@
projectRoot = ""; projectRoot = "";
targets = ( targets = (
51E94E0E164472080035348C /* Sample Lib */, 51E94E0E164472080035348C /* Sample Lib */,
137F16121D3AFC2900029696 /* Sample Framework */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
137F16111D3AFC2900029696 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
137F160E1D3AFC2900029696 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
137F161C1D3AFC6700029696 /* Sample.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
51E94E0B164472080035348C /* Sources */ = { 51E94E0B164472080035348C /* Sources */ = {
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -146,6 +224,89 @@ ...@@ -146,6 +224,89 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
137F16181D3AFC2900029696 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "Sample Framework/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "cocoapods.Sample-Framework";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
137F16191D3AFC2900029696 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "Sample Framework/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "cocoapods.Sample-Framework";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
51E94E1B164472090035348C /* Debug */ = { 51E94E1B164472090035348C /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
...@@ -220,6 +381,14 @@ ...@@ -220,6 +381,14 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
137F161A1D3AFC2900029696 /* Build configuration list for PBXNativeTarget "Sample Framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
137F16181D3AFC2900029696 /* Debug */,
137F16191D3AFC2900029696 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */ = { 51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
......
spec/fixtures/SampleProject/SampleProject.xcodeproj/project.pbxproj
View file @ 0fec0e09
...@@ -38,6 +38,20 @@ ...@@ -38,6 +38,20 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
137F16201D3AFC7B00029696 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 137F16131D3AFC2900029696;
remoteInfo = "Sample Framework";
};
13C6236F1D3B00F900EFB98B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 137F16121D3AFC2900029696;
remoteInfo = "Sample Framework";
};
51E94E27164472200035348C /* PBXContainerItemProxy */ = { 51E94E27164472200035348C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */; containerPortal = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
...@@ -164,6 +178,7 @@ ...@@ -164,6 +178,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
51E94E28164472200035348C /* libSample Lib.a */, 51E94E28164472200035348C /* libSample Lib.a */,
137F16211D3AFC7B00029696 /* Sample Framework.framework */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -280,6 +295,7 @@ ...@@ -280,6 +295,7 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
13C623701D3B00F900EFB98B /* PBXTargetDependency */,
); );
name = SampleProject; name = SampleProject;
productName = SampleProject; productName = SampleProject;
...@@ -351,6 +367,13 @@ ...@@ -351,6 +367,13 @@
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXReferenceProxy section */ /* Begin PBXReferenceProxy section */
137F16211D3AFC7B00029696 /* Sample Framework.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = "Sample Framework.framework";
remoteRef = 137F16201D3AFC7B00029696 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
51E94E28164472200035348C /* libSample Lib.a */ = { 51E94E28164472200035348C /* libSample Lib.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
...@@ -424,6 +447,11 @@ ...@@ -424,6 +447,11 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
13C623701D3B00F900EFB98B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "Sample Framework";
targetProxy = 13C6236F1D3B00F900EFB98B /* PBXContainerItemProxy */;
};
C0C495391B9E5C47004F9854 /* PBXTargetDependency */ = { C0C495391B9E5C47004F9854 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = A346496C14F9BE9A0080D870 /* SampleProject */; target = A346496C14F9BE9A0080D870 /* SampleProject */;
...@@ -959,6 +987,7 @@ ...@@ -959,6 +987,7 @@
C0C4953E1B9E5C47004F9854 /* App Store */, C0C4953E1B9E5C47004F9854 /* App Store */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
......
spec/unit/installer/analyzer_spec.rb
View file @ 0fec0e09
...@@ -711,11 +711,33 @@ module Pod ...@@ -711,11 +711,33 @@ module Pod
].sort ].sort
end end
it "copy a framework's pod target, when the framework is in a sub project" do
podfile = Pod::Podfile.new do
source SpecHelper.test_repo_url
use_frameworks!
platform :ios, '8.0'
project 'SampleProject/SampleProject'
target 'SampleProject'
target 'Sample Framework' do
project 'SampleProject/Sample Lib/Sample Lib'
pod 'monkey'
end
end
analyzer = Pod::Installer::Analyzer.new(config.sandbox, podfile)
result = analyzer.analyze
result.targets.flat_map { |at| at.pod_targets.map { |pt| "#{at.name}/#{pt.name}" } }.sort.should == [
'Pods-Sample Framework/monkey',
].sort
end
it "raises when unable to find an extension's host target" do it "raises when unable to find an extension's host target" do
podfile = Pod::Podfile.new do podfile = Pod::Podfile.new do
source SpecHelper.test_repo_url source SpecHelper.test_repo_url
use_frameworks! use_frameworks!
platform :ios, '6.0' platform :ios, '8.0'
project 'Sample Extensions Project/Sample Extensions Project' project 'Sample Extensions Project/Sample Extensions Project'
target 'Today Extension' do target 'Today Extension' do
...@@ -731,7 +753,7 @@ module Pod ...@@ -731,7 +753,7 @@ module Pod
it 'raises when the extension calls use_frameworks!, but the host target does not' do it 'raises when the extension calls use_frameworks!, but the host target does not' do
podfile = Pod::Podfile.new do podfile = Pod::Podfile.new do
source SpecHelper.test_repo_url source SpecHelper.test_repo_url
platform :ios, '6.0' platform :ios, '8.0'
project 'Sample Extensions Project/Sample Extensions Project' project 'Sample Extensions Project/Sample Extensions Project'
target 'Sample Extensions Project' do target 'Sample Extensions Project' do
......
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