diff --git a/CoreLocation/CoreLocation.xcodeproj/project.pbxproj b/CoreLocation/CoreLocation.xcodeproj/project.pbxproj index 7c8aa0b..5108aa6 100644 --- a/CoreLocation/CoreLocation.xcodeproj/project.pbxproj +++ b/CoreLocation/CoreLocation.xcodeproj/project.pbxproj @@ -35,7 +35,7 @@ AE3848DE168CD86000C99B55 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE3848DD168CD86000C99B55 /* CoreGraphics.framework */; }; AE38491A168CD8D800C99B55 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE3848DB168CD86000C99B55 /* Foundation.framework */; }; AE384944168CD91E00C99B55 /* Cedar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE384933168CD8FC00C99B55 /* Cedar.framework */; }; - AE384948168CD9AA00C99B55 /* CoreLocation+PivotalSpecHelper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE384900168CD8C800C99B55 /* CoreLocation+PivotalSpecHelper.framework */; }; + AE384948168CD9AA00C99B55 /* CoreLocation_PivotalSpecHelper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE384900168CD8C800C99B55 /* CoreLocation_PivotalSpecHelper.framework */; }; AE384950168CD9B600C99B55 /* CoreLocation+PivotalSpecHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = AE38494B168CD9B600C99B55 /* CoreLocation+PivotalSpecHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; AE384951168CD9B600C99B55 /* CLGeocoder+Spec.h in Headers */ = {isa = PBXBuildFile; fileRef = AE38494D168CD9B600C99B55 /* CLGeocoder+Spec.h */; settings = {ATTRIBUTES = (Public, ); }; }; AE384952168CD9B600C99B55 /* CLGeocoder+Spec.m in Sources */ = {isa = PBXBuildFile; fileRef = AE38494E168CD9B600C99B55 /* CLGeocoder+Spec.m */; }; @@ -286,7 +286,7 @@ AE3848D9168CD86000C99B55 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; AE3848DB168CD86000C99B55 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; AE3848DD168CD86000C99B55 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - AE384900168CD8C800C99B55 /* CoreLocation+PivotalSpecHelper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "CoreLocation+PivotalSpecHelper.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + AE384900168CD8C800C99B55 /* CoreLocation_PivotalSpecHelper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreLocation_PivotalSpecHelper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AE384918168CD8D800C99B55 /* CoreLocationSpec */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CoreLocationSpec; sourceTree = BUILT_PRODUCTS_DIR; }; AE384926168CD8FB00C99B55 /* Cedar.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Cedar.xcodeproj; path = ../Externals/Cedar/Cedar.xcodeproj; sourceTree = ""; }; AE38494B168CD9B600C99B55 /* CoreLocation+PivotalSpecHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CoreLocation+PivotalSpecHelper.h"; sourceTree = ""; }; @@ -356,7 +356,7 @@ buildActionMask = 2147483647; files = ( AE384962168D033C00C99B55 /* CoreLocation.framework in Frameworks */, - AE384948168CD9AA00C99B55 /* CoreLocation+PivotalSpecHelper.framework in Frameworks */, + AE384948168CD9AA00C99B55 /* CoreLocation_PivotalSpecHelper.framework in Frameworks */, AE384944168CD91E00C99B55 /* Cedar.framework in Frameworks */, AE38491A168CD8D800C99B55 /* Foundation.framework in Frameworks */, ); @@ -407,7 +407,7 @@ isa = PBXGroup; children = ( AE3848D5168CD86000C99B55 /* CoreLocation-StaticLibSpec.app */, - AE384900168CD8C800C99B55 /* CoreLocation+PivotalSpecHelper.framework */, + AE384900168CD8C800C99B55 /* CoreLocation_PivotalSpecHelper.framework */, AE384918168CD8D800C99B55 /* CoreLocationSpec */, AE38498E168D053300C99B55 /* libCoreLocation+PivotalSpecHelper-StaticLib.a */, 3466C06B1B97A2ED00CBAB59 /* CoreLocation-StaticLibSpecBundle.xctest */, @@ -671,7 +671,7 @@ ); name = "CoreLocation+PivotalSpecHelper"; productName = "CoreLocation+PivotalCore"; - productReference = AE384900168CD8C800C99B55 /* CoreLocation+PivotalSpecHelper.framework */; + productReference = AE384900168CD8C800C99B55 /* CoreLocation_PivotalSpecHelper.framework */; productType = "com.apple.product-type.framework"; }; AE384917168CD8D800C99B55 /* CoreLocationSpec */ = { @@ -779,6 +779,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = AE3848CA168CD86000C99B55; @@ -1485,7 +1486,7 @@ INSTALL_PATH = "@executable_path"; MACOSX_DEPLOYMENT_TARGET = 10.8; PRODUCT_BUNDLE_IDENTIFIER = "io.pivotal.CoreLocation-PivotalSpecHelper"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = CoreLocation_PivotalSpecHelper; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; @@ -1510,7 +1511,7 @@ INSTALL_PATH = "@executable_path"; MACOSX_DEPLOYMENT_TARGET = 10.8; PRODUCT_BUNDLE_IDENTIFIER = "io.pivotal.CoreLocation-PivotalSpecHelper"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = CoreLocation_PivotalSpecHelper; SDKROOT = macosx; WRAPPER_EXTENSION = framework; }; diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme index 43e3993..edc51d4 100644 --- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme +++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme index 43e3993..edc51d4 100644 --- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme +++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/Foundation/Foundation.xcodeproj/project.pbxproj b/Foundation/Foundation.xcodeproj/project.pbxproj index 7bc43a7..82a97b0 100644 --- a/Foundation/Foundation.xcodeproj/project.pbxproj +++ b/Foundation/Foundation.xcodeproj/project.pbxproj @@ -401,8 +401,8 @@ AEA96BF7168B56BF00861DF1 /* PCKHTTPInterfaceSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = AEA96BEA168B56BF00861DF1 /* PCKHTTPInterfaceSpec.mm */; }; AEA96BF9168B56BF00861DF1 /* PCKResponseParserSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = AEA96BED168B56BF00861DF1 /* PCKResponseParserSpec.mm */; }; AEA96BFA168B56BF00861DF1 /* PCKXMLParserSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = AEA96BEE168B56BF00861DF1 /* PCKXMLParserSpec.mm */; }; - AEA96BFE168B56FA00861DF1 /* Foundation+PivotalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA96B49168B506500861DF1 /* Foundation+PivotalCore.framework */; }; - AEA96C03168B570B00861DF1 /* Foundation+PivotalSpecHelper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA96B9E168B541900861DF1 /* Foundation+PivotalSpecHelper.framework */; }; + AEA96BFE168B56FA00861DF1 /* Foundation_PivotalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA96B49168B506500861DF1 /* Foundation_PivotalCore.framework */; }; + AEA96C03168B570B00861DF1 /* Foundation_PivotalSpecHelper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA96B9E168B541900861DF1 /* Foundation_PivotalSpecHelper.framework */; }; AEA96C08168B58AA00861DF1 /* FakeConnectionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA96C07168B58AA00861DF1 /* FakeConnectionDelegate.m */; }; AEA96C39168B602700861DF1 /* FixturesHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA96C38168B602700861DF1 /* FixturesHelper.m */; }; AEA96C55168B636E00861DF1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE24D5AF138170CD00E4420A /* Foundation.framework */; }; @@ -847,7 +847,7 @@ AE96934E182D97A900E7306C /* NSUUIDSpec+Spec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSUUIDSpec+Spec.mm"; sourceTree = ""; }; AE96935F182D9A1900E7306C /* NSUUID+Spec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSUUID+Spec.h"; sourceTree = ""; }; AE969360182D9A1900E7306C /* NSUUID+Spec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSUUID+Spec.m"; sourceTree = ""; }; - AEA96B49168B506500861DF1 /* Foundation+PivotalCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "Foundation+PivotalCore.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + AEA96B49168B506500861DF1 /* Foundation_PivotalCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Foundation_PivotalCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AEA96B5E168B50D900861DF1 /* NSData+PivotalCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+PivotalCore.h"; sourceTree = ""; }; AEA96B5F168B50D900861DF1 /* NSData+PivotalCore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+PivotalCore.m"; sourceTree = ""; }; AEA96B60168B50D900861DF1 /* NSObject+MethodDecoration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MethodDecoration.h"; sourceTree = ""; }; @@ -874,7 +874,7 @@ AEA96B77168B50D900861DF1 /* PCKXMLParserDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PCKXMLParserDelegate.h; sourceTree = ""; }; AEA96B78168B50D900861DF1 /* PCKXMLParserDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PCKXMLParserDelegate.m; sourceTree = ""; }; AEA96B79168B50D900861DF1 /* Foundation+PivotalCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Foundation+PivotalCore.h"; sourceTree = ""; }; - AEA96B9E168B541900861DF1 /* Foundation+PivotalSpecHelper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "Foundation+PivotalSpecHelper.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + AEA96B9E168B541900861DF1 /* Foundation_PivotalSpecHelper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Foundation_PivotalSpecHelper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AEA96BB3168B544D00861DF1 /* NSURLConnection+Spec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLConnection+Spec.h"; sourceTree = ""; }; AEA96BB4168B544D00861DF1 /* NSURLConnection+Spec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLConnection+Spec.m"; sourceTree = ""; }; AEA96BB5168B544D00861DF1 /* NSURLRequest+Spec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLRequest+Spec.h"; sourceTree = ""; }; @@ -1026,8 +1026,8 @@ AEE971D41708EB760094B5A2 /* libFakeHTTP.a in Frameworks */, AEBCCB6E168B7E930056EE83 /* Foundation.framework in Frameworks */, AEBCCB6D168B7E7C0056EE83 /* Cedar.framework in Frameworks */, - AEA96C03168B570B00861DF1 /* Foundation+PivotalSpecHelper.framework in Frameworks */, - AEA96BFE168B56FA00861DF1 /* Foundation+PivotalCore.framework in Frameworks */, + AEA96C03168B570B00861DF1 /* Foundation_PivotalSpecHelper.framework in Frameworks */, + AEA96BFE168B56FA00861DF1 /* Foundation_PivotalCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1067,8 +1067,8 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - AEA96B49168B506500861DF1 /* Foundation+PivotalCore.framework */, - AEA96B9E168B541900861DF1 /* Foundation+PivotalSpecHelper.framework */, + AEA96B49168B506500861DF1 /* Foundation_PivotalCore.framework */, + AEA96B9E168B541900861DF1 /* Foundation_PivotalSpecHelper.framework */, AEA96BD3168B561500861DF1 /* FoundationSpec */, AEA96C54168B636E00861DF1 /* libFoundation+PivotalCore-StaticLib.a */, AEA96C64168B63BD00861DF1 /* libFoundation+PivotalSpecHelper-StaticLib.a */, @@ -1802,7 +1802,7 @@ ); name = "Foundation+PivotalCore"; productName = "Foundation+PivotalCore"; - productReference = AEA96B49168B506500861DF1 /* Foundation+PivotalCore.framework */; + productReference = AEA96B49168B506500861DF1 /* Foundation_PivotalCore.framework */; productType = "com.apple.product-type.framework"; }; AEA96B9D168B541900861DF1 /* Foundation+PivotalSpecHelper */ = { @@ -1820,7 +1820,7 @@ ); name = "Foundation+PivotalSpecHelper"; productName = "Foundation+PivotalSpecHelper"; - productReference = AEA96B9E168B541900861DF1 /* Foundation+PivotalSpecHelper.framework */; + productReference = AEA96B9E168B541900861DF1 /* Foundation_PivotalSpecHelper.framework */; productType = "com.apple.product-type.framework"; }; AEA96BD2168B561500861DF1 /* FoundationSpec */ = { @@ -3444,7 +3444,7 @@ INSTALL_PATH = "@executable_path"; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "io.pivotal.Foundation-PivotalCoreKit"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Foundation_PivotalCore; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -3469,7 +3469,7 @@ INSTALL_PATH = "@executable_path"; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "io.pivotal.Foundation-PivotalCoreKit"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Foundation_PivotalCore; WRAPPER_EXTENSION = framework; }; name = Release; @@ -3483,6 +3483,8 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -3499,8 +3501,10 @@ INFOPLIST_FILE = "../InfoPlist/Framework-Info.plist"; INSTALL_PATH = "@executable_path"; MACOSX_DEPLOYMENT_TARGET = 10.9; + MODULEMAP_FILE = "SpecHelper/Foundation+PivotalSpecHelper.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = "com.pivotallabs.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Foundation_PivotalSpecHelper; + VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -3514,7 +3518,9 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -3525,8 +3531,10 @@ INFOPLIST_FILE = "../InfoPlist/Framework-Info.plist"; INSTALL_PATH = "@executable_path"; MACOSX_DEPLOYMENT_TARGET = 10.9; + MODULEMAP_FILE = "SpecHelper/Foundation+PivotalSpecHelper.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = "com.pivotallabs.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Foundation_PivotalSpecHelper; + VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = framework; }; name = Release; diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme index dda6e5b..02f0682 100644 --- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme +++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme index dda6e5b..02f0682 100644 --- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme +++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme index bafa4e2..471bfc0 100644 --- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme +++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme index bafa4e2..471bfc0 100644 --- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme +++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@