From bda82adb2ac48bfac5b97cfbc3b6c8e20e45cb5b Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Thu, 21 Mar 2019 22:05:19 +1100 Subject: [PATCH 1/5] Extract all configuration from the Xcode projects so that it can be shared where appropriate --- Apollo.xcodeproj/project.pbxproj | 498 +++--------------- Apollo.xcworkspace/contents.xcworkspacedata | 3 + ApolloSQLite.xcodeproj/project.pbxproj | 236 +-------- ApolloWebSocket.xcodeproj/project.pbxproj | 224 +------- .../Apollo/Apollo-Project-Debug.xcconfig | 1 + ...pollo-Project-Performance-Testing.xcconfig | 4 + .../Apollo/Apollo-Project-Release.xcconfig | 1 + ...Apollo-Target-CacheDependentTests.xcconfig | 3 + .../Apollo/Apollo-Target-Framework.xcconfig | 3 + .../Apollo/Apollo-Target-GitHubAPI.xcconfig | 3 + .../Apollo-Target-PerformanceTests.xcconfig | 3 + .../Apollo/Apollo-Target-StarWarsAPI.xcconfig | 3 + .../Apollo-Target-TestHost-iOS.xcconfig | 13 + .../Apollo/Apollo-Target-TestSupport.xcconfig | 7 + .../Apollo/Apollo-Target-Tests.xcconfig | 3 + .../ApolloSQLite-Project-Debug.xcconfig | 1 + .../ApolloSQLite-Project-Release.xcconfig | 1 + .../ApolloSQLite-Target-Framework.xcconfig | 4 + .../ApolloSQLite-Target-TestSupport.xcconfig | 7 + .../ApolloSQLite-Target-Tests.xcconfig | 3 + .../ApolloWebSocket-Project-Debug.xcconfig | 1 + .../ApolloWebSocket-Project-Release.xcconfig | 1 + .../ApolloWebSocket-Target-Framework.xcconfig | 3 + .../ApolloWebSocket-Target-Tests.xcconfig | 3 + Configuration/Shared/Project-Debug.xcconfig | 1 + Configuration/Shared/Project-Release.xcconfig | 5 + .../Shared/Project-Version.xcconfig | 0 .../Shared/Workspace-Analysis.xcconfig | 2 + .../Shared/Workspace-Code-Generation.xcconfig | 6 + Configuration/Shared/Workspace-Debug.xcconfig | 22 + .../Workspace-Deployment-Targets.xcconfig | 14 + .../Shared/Workspace-Language.xcconfig | 24 + .../Shared/Workspace-Linking.xcconfig | 5 + .../Shared/Workspace-Packaging.xcconfig | 4 + .../Shared/Workspace-Release.xcconfig | 21 + .../Shared/Workspace-Search-Paths.xcconfig | 4 + .../Shared/Workspace-Shared.xcconfig | 12 + .../Workspace-Target-Application.xcconfig | 1 + .../Workspace-Target-Framework.xcconfig | 15 + .../Shared/Workspace-Target-Test.xcconfig | 8 + .../Workspace-Universal-Framework.xcconfig | 34 ++ .../Workspace-Universal-Target.xcconfig | 3 + .../Shared/Workspace-Universal-Test.xcconfig | 2 + .../Shared/Workspace-Warnings.xcconfig | 27 + Framework.xcconfig | 29 - scripts/version-constants.sh | 2 +- 46 files changed, 386 insertions(+), 884 deletions(-) create mode 100644 Configuration/Apollo/Apollo-Project-Debug.xcconfig create mode 100644 Configuration/Apollo/Apollo-Project-Performance-Testing.xcconfig create mode 100644 Configuration/Apollo/Apollo-Project-Release.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-CacheDependentTests.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-Framework.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-GitHubAPI.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-PerformanceTests.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-StarWarsAPI.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-TestHost-iOS.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-TestSupport.xcconfig create mode 100644 Configuration/Apollo/Apollo-Target-Tests.xcconfig create mode 100644 Configuration/ApolloSQLite/ApolloSQLite-Project-Debug.xcconfig create mode 100644 Configuration/ApolloSQLite/ApolloSQLite-Project-Release.xcconfig create mode 100644 Configuration/ApolloSQLite/ApolloSQLite-Target-Framework.xcconfig create mode 100644 Configuration/ApolloSQLite/ApolloSQLite-Target-TestSupport.xcconfig create mode 100644 Configuration/ApolloSQLite/ApolloSQLite-Target-Tests.xcconfig create mode 100644 Configuration/ApolloWebSocket/ApolloWebSocket-Project-Debug.xcconfig create mode 100644 Configuration/ApolloWebSocket/ApolloWebSocket-Project-Release.xcconfig create mode 100644 Configuration/ApolloWebSocket/ApolloWebSocket-Target-Framework.xcconfig create mode 100644 Configuration/ApolloWebSocket/ApolloWebSocket-Target-Tests.xcconfig create mode 100644 Configuration/Shared/Project-Debug.xcconfig create mode 100644 Configuration/Shared/Project-Release.xcconfig rename Version.xcconfig => Configuration/Shared/Project-Version.xcconfig (100%) create mode 100644 Configuration/Shared/Workspace-Analysis.xcconfig create mode 100644 Configuration/Shared/Workspace-Code-Generation.xcconfig create mode 100644 Configuration/Shared/Workspace-Debug.xcconfig create mode 100644 Configuration/Shared/Workspace-Deployment-Targets.xcconfig create mode 100644 Configuration/Shared/Workspace-Language.xcconfig create mode 100644 Configuration/Shared/Workspace-Linking.xcconfig create mode 100644 Configuration/Shared/Workspace-Packaging.xcconfig create mode 100644 Configuration/Shared/Workspace-Release.xcconfig create mode 100644 Configuration/Shared/Workspace-Search-Paths.xcconfig create mode 100644 Configuration/Shared/Workspace-Shared.xcconfig create mode 100644 Configuration/Shared/Workspace-Target-Application.xcconfig create mode 100644 Configuration/Shared/Workspace-Target-Framework.xcconfig create mode 100644 Configuration/Shared/Workspace-Target-Test.xcconfig create mode 100644 Configuration/Shared/Workspace-Universal-Framework.xcconfig create mode 100644 Configuration/Shared/Workspace-Universal-Target.xcconfig create mode 100644 Configuration/Shared/Workspace-Universal-Test.xcconfig create mode 100644 Configuration/Shared/Workspace-Warnings.xcconfig delete mode 100644 Framework.xcconfig diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj index 3d2d94a754..eeab20de68 100644 --- a/Apollo.xcodeproj/project.pbxproj +++ b/Apollo.xcodeproj/project.pbxproj @@ -50,7 +50,6 @@ 9FADC84A1E6B0B2300C677E6 /* Locking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FADC8491E6B0B2300C677E6 /* Locking.swift */; }; 9FADC84F1E6B865E00C677E6 /* DataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FADC84E1E6B865E00C677E6 /* DataLoader.swift */; }; 9FADC8541E6B86D900C677E6 /* DataLoaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FADC8531E6B86D900C677E6 /* DataLoaderTests.swift */; }; - 9FB9D1551EC102CB0086EEB5 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FB9D1541EC102CB0086EEB5 /* XCTest.framework */; }; 9FC2333D1E66BBF7001E4541 /* GraphQLDependencyTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC2333C1E66BBF7001E4541 /* GraphQLDependencyTracker.swift */; }; 9FC4B9201D2A6F8D0046A641 /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC4B91F1D2A6F8D0046A641 /* JSON.swift */; }; 9FC631361E6AE2080062707E /* PromiseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC631351E6AE2080062707E /* PromiseTests.swift */; }; @@ -231,6 +230,17 @@ /* Begin PBXFileReference section */ 54DDB0911EA045870009DD99 /* InMemoryNormalizedCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InMemoryNormalizedCache.swift; sourceTree = ""; }; + 90690D05224333DA00FC2E54 /* Apollo-Project-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Project-Debug.xcconfig"; sourceTree = ""; }; + 90690D06224333DA00FC2E54 /* Apollo-Target-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-Framework.xcconfig"; sourceTree = ""; }; + 90690D07224333DA00FC2E54 /* Apollo-Project-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Project-Release.xcconfig"; sourceTree = ""; }; + 90690D08224333DA00FC2E54 /* Apollo-Project-Performance-Testing.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Project-Performance-Testing.xcconfig"; sourceTree = ""; }; + 90690D0B2243345500FC2E54 /* Apollo-Target-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-Tests.xcconfig"; sourceTree = ""; }; + 90690D142243363D00FC2E54 /* Apollo-Target-TestHost-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-TestHost-iOS.xcconfig"; sourceTree = ""; }; + 90690D2122433C1900FC2E54 /* Apollo-Target-StarWarsAPI.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-StarWarsAPI.xcconfig"; sourceTree = ""; }; + 90690D2222433C2800FC2E54 /* Apollo-Target-GitHubAPI.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-GitHubAPI.xcconfig"; sourceTree = ""; }; + 90690D2322433C5900FC2E54 /* Apollo-Target-CacheDependentTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-CacheDependentTests.xcconfig"; sourceTree = ""; }; + 90690D2422433C8000FC2E54 /* Apollo-Target-PerformanceTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-PerformanceTests.xcconfig"; sourceTree = ""; }; + 90690D2522433CAF00FC2E54 /* Apollo-Target-TestSupport.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-TestSupport.xcconfig"; sourceTree = ""; }; 9F10A51D1EC1BA0F0045E62B /* MockNetworkTransport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockNetworkTransport.swift; sourceTree = ""; }; 9F19D8431EED568200C57247 /* ResultOrPromise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResultOrPromise.swift; sourceTree = ""; }; 9F19D8451EED8D3B00C57247 /* ResultOrPromiseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResultOrPromiseTests.swift; sourceTree = ""; }; @@ -256,7 +266,6 @@ 9F8A95831EC0FD6100304A2D /* XCTestCase+Promise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTestCase+Promise.swift"; sourceTree = ""; }; 9F8A95851EC0FD9800304A2D /* TestCacheProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestCacheProvider.swift; sourceTree = ""; }; 9F91CF8E1F6C0DB2008DD0BE /* MutatingResultsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutatingResultsTests.swift; sourceTree = ""; }; - 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = ""; }; 9FA6ABBC1EC0A988000017BE /* ApolloCacheDependentTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ApolloCacheDependentTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 9FA6ABC01EC0A988000017BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9FA6ABC51EC0A9F7000017BE /* FetchQueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchQueryTests.swift; sourceTree = ""; }; @@ -274,7 +283,6 @@ 9FADC8491E6B0B2300C677E6 /* Locking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locking.swift; sourceTree = ""; }; 9FADC84E1E6B865E00C677E6 /* DataLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataLoader.swift; sourceTree = ""; }; 9FADC8531E6B86D900C677E6 /* DataLoaderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataLoaderTests.swift; sourceTree = ""; }; - 9FB9D1541EC102CB0086EEB5 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 9FC2333C1E66BBF7001E4541 /* GraphQLDependencyTracker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphQLDependencyTracker.swift; sourceTree = ""; }; 9FC4B91F1D2A6F8D0046A641 /* JSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = ""; }; 9FC631331E6AE2080062707E /* ApolloPerformanceTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ApolloPerformanceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -342,7 +350,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9FB9D1551EC102CB0086EEB5 /* XCTest.framework in Frameworks */, 9F65B1211EC106F30090B25F /* Apollo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -375,13 +382,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9FC750401D2A532C00458D91 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9FC7504B1D2A532D00458D91 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -413,6 +413,25 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 90690D04224333DA00FC2E54 /* Configuration */ = { + isa = PBXGroup; + children = ( + 90690D05224333DA00FC2E54 /* Apollo-Project-Debug.xcconfig */, + 90690D08224333DA00FC2E54 /* Apollo-Project-Performance-Testing.xcconfig */, + 90690D07224333DA00FC2E54 /* Apollo-Project-Release.xcconfig */, + 90690D2322433C5900FC2E54 /* Apollo-Target-CacheDependentTests.xcconfig */, + 90690D06224333DA00FC2E54 /* Apollo-Target-Framework.xcconfig */, + 90690D2222433C2800FC2E54 /* Apollo-Target-GitHubAPI.xcconfig */, + 90690D2422433C8000FC2E54 /* Apollo-Target-PerformanceTests.xcconfig */, + 90690D2122433C1900FC2E54 /* Apollo-Target-StarWarsAPI.xcconfig */, + 90690D142243363D00FC2E54 /* Apollo-Target-TestHost-iOS.xcconfig */, + 90690D0B2243345500FC2E54 /* Apollo-Target-Tests.xcconfig */, + 90690D2522433CAF00FC2E54 /* Apollo-Target-TestSupport.xcconfig */, + ); + name = Configuration; + path = Configuration/Apollo; + sourceTree = ""; + }; 9F27D4601D40363A00715680 /* Execution */ = { isa = PBXGroup; children = ( @@ -441,14 +460,6 @@ path = ApolloTestSupport; sourceTree = ""; }; - 9F98C84C1EC0859C00FFD919 /* Configuration */ = { - isa = PBXGroup; - children = ( - 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */, - ); - name = Configuration; - sourceTree = ""; - }; 9FA6ABBD1EC0A988000017BE /* ApolloCacheDependentTests */ = { isa = PBXGroup; children = ( @@ -475,14 +486,6 @@ path = GitHubAPI; sourceTree = ""; }; - 9FB9D1531EC102CB0086EEB5 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 9FB9D1541EC102CB0086EEB5 /* XCTest.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9FC4B9231D2BE4F00046A641 /* JSON */ = { isa = PBXGroup; children = ( @@ -508,9 +511,8 @@ children = ( 9FC750461D2A532C00458D91 /* Apollo */, 9FCE2CF41E6C20E000E34457 /* Tests */, - 9F98C84C1EC0859C00FFD919 /* Configuration */, + 90690D04224333DA00FC2E54 /* Configuration */, 9FC750451D2A532C00458D91 /* Products */, - 9FB9D1531EC102CB0086EEB5 /* Frameworks */, ); sourceTree = ""; }; @@ -714,7 +716,6 @@ 9F8A95731EC0FC1200304A2D /* Sources */, 9F8A95741EC0FC1200304A2D /* Frameworks */, 9F8A95751EC0FC1200304A2D /* Headers */, - 9F8A95761EC0FC1200304A2D /* Resources */, ); buildRules = ( ); @@ -732,7 +733,6 @@ buildPhases = ( 9FA6ABB81EC0A988000017BE /* Sources */, 9FA6ABB91EC0A988000017BE /* Frameworks */, - 9FA6ABBA1EC0A988000017BE /* Resources */, ); buildRules = ( ); @@ -754,7 +754,6 @@ 9FACA9BB1F42E67200AE2DBD /* Sources */, 9FACA9BD1F42E67200AE2DBD /* Frameworks */, 9FACA9BF1F42E67200AE2DBD /* Headers */, - 9FACA9C11F42E67200AE2DBD /* Resources */, ); buildRules = ( ); @@ -772,7 +771,6 @@ buildPhases = ( 9FC6312F1E6AE2080062707E /* Sources */, 9FC631301E6AE2080062707E /* Frameworks */, - 9FC631311E6AE2080062707E /* Resources */, ); buildRules = ( ); @@ -792,7 +790,6 @@ buildConfigurationList = 9FC750581D2A532D00458D91 /* Build configuration list for PBXNativeTarget "Apollo" */; buildPhases = ( 9FC7503F1D2A532C00458D91 /* Sources */, - 9FC750401D2A532C00458D91 /* Frameworks */, 9FC750411D2A532C00458D91 /* Headers */, 9FC750421D2A532C00458D91 /* Resources */, ); @@ -811,7 +808,6 @@ buildPhases = ( 9FC7504A1D2A532D00458D91 /* Sources */, 9FC7504B1D2A532D00458D91 /* Frameworks */, - 9FC7504C1D2A532D00458D91 /* Resources */, ); buildRules = ( ); @@ -833,7 +829,6 @@ 9FCE2CF51E6C213D00E34457 /* Sources */, 9FCE2CF61E6C213D00E34457 /* Frameworks */, 9FCE2CF71E6C213D00E34457 /* Headers */, - 9FCE2CF81E6C213D00E34457 /* Resources */, ); buildRules = ( ); @@ -922,6 +917,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -943,34 +939,6 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 9F8A95761EC0FC1200304A2D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9FA6ABBA1EC0A988000017BE /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9FACA9C11F42E67200AE2DBD /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9FC631311E6AE2080062707E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9FC750421D2A532C00458D91 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -980,20 +948,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9FC7504C1D2A532D00458D91 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9FCE2CF81E6C213D00E34457 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9FD637DF1E6ACF88001EDBC8 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1262,524 +1216,190 @@ /* Begin XCBuildConfiguration section */ 9F8A957D1EC0FC1200304A2D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2522433CAF00FC2E54 /* Apollo-Target-TestSupport.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - INFOPLIST_FILE = Tests/ApolloTestSupport/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-weak_framework", - XCTest, - "-weak-lswiftXCTest", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloTestSupport; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; }; 9F8A957E1EC0FC1200304A2D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2522433CAF00FC2E54 /* Apollo-Target-TestSupport.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - INFOPLIST_FILE = Tests/ApolloTestSupport/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-weak_framework", - XCTest, - "-weak-lswiftXCTest", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloTestSupport; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release; }; 9F8A957F1EC0FC1200304A2D /* PerformanceTesting */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2522433CAF00FC2E54 /* Apollo-Target-TestSupport.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - INFOPLIST_FILE = Tests/ApolloTestSupport/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-weak_framework", - XCTest, - "-weak-lswiftXCTest", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloTestSupport; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; }; name = PerformanceTesting; }; 9FA6ABC21EC0A988000017BE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2322433C5900FC2E54 /* Apollo-Target-CacheDependentTests.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = Tests/ApolloCacheDependentTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloCacheDependentTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 9FA6ABC31EC0A988000017BE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2322433C5900FC2E54 /* Apollo-Target-CacheDependentTests.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = Tests/ApolloCacheDependentTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloCacheDependentTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 9FA6ABC41EC0A988000017BE /* PerformanceTesting */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2322433C5900FC2E54 /* Apollo-Target-CacheDependentTests.xcconfig */; buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = Tests/ApolloCacheDependentTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloCacheDependentTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = PerformanceTesting; }; 9FACA9C31F42E67200AE2DBD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2222433C2800FC2E54 /* Apollo-Target-GitHubAPI.xcconfig */; buildSettings = { - DEFINES_MODULE = YES; - INFOPLIST_FILE = Tests/GitHubAPI/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 9FACA9C41F42E67200AE2DBD /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2222433C2800FC2E54 /* Apollo-Target-GitHubAPI.xcconfig */; buildSettings = { - DEFINES_MODULE = YES; - INFOPLIST_FILE = Tests/GitHubAPI/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 9FACA9C51F42E67200AE2DBD /* PerformanceTesting */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2222433C2800FC2E54 /* Apollo-Target-GitHubAPI.xcconfig */; buildSettings = { - DEFINES_MODULE = YES; - INFOPLIST_FILE = Tests/GitHubAPI/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = PerformanceTesting; }; 9FC6313C1E6AE2080062707E /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D2422433C8000FC2E54 /* Apollo-Target-PerformanceTests.xcconfig */; buildSettings = { - INFOPLIST_FILE = Tests/ApolloPerformanceTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloPerformanceTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestHost iOS.app/TestHost iOS"; }; name = Debug; }; 9FC6313D1E6AE2080062707E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D2422433C8000FC2E54 /* Apollo-Target-PerformanceTests.xcconfig */; buildSettings = { - INFOPLIST_FILE = Tests/ApolloPerformanceTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloPerformanceTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestHost iOS.app/TestHost iOS"; }; name = Release; }; 9FC750561D2A532D00458D91 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D05224333DA00FC2E54 /* Apollo-Project-Debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = ""; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 9FC750571D2A532D00458D91 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D07224333DA00FC2E54 /* Apollo-Project-Release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = ""; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 9FC750591D2A532D00458D91 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D06224333DA00FC2E54 /* Apollo-Target-Framework.xcconfig */; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DEFINES_MODULE = YES; - INFOPLIST_FILE = Sources/Apollo/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.Apollo; - PRODUCT_NAME = Apollo; }; name = Debug; }; 9FC7505A1D2A532D00458D91 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D06224333DA00FC2E54 /* Apollo-Target-Framework.xcconfig */; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DEFINES_MODULE = YES; - INFOPLIST_FILE = Sources/Apollo/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.Apollo; - PRODUCT_NAME = Apollo; }; name = Release; }; 9FC7505C1D2A532D00458D91 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D0B2243345500FC2E54 /* Apollo-Target-Tests.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Tests/ApolloTests/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollostack.ApolloTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 9FC7505D1D2A532D00458D91 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D0B2243345500FC2E54 /* Apollo-Target-Tests.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Tests/ApolloTests/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollostack.ApolloTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 9FCE2D041E6C213D00E34457 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2122433C1900FC2E54 /* Apollo-Target-StarWarsAPI.xcconfig */; buildSettings = { - DEFINES_MODULE = YES; - INFOPLIST_FILE = Tests/StarWarsAPI/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.StarWarsAPI; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 9FCE2D051E6C213D00E34457 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2122433C1900FC2E54 /* Apollo-Target-StarWarsAPI.xcconfig */; buildSettings = { - DEFINES_MODULE = YES; - INFOPLIST_FILE = Tests/StarWarsAPI/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.StarWarsAPI; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 9FD637F11E6ACF88001EDBC8 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D142243363D00FC2E54 /* Apollo-Target-TestHost-iOS.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = "Tests/TestHost iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.TestHost; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; }; name = Debug; }; 9FD637F21E6ACF88001EDBC8 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D142243363D00FC2E54 /* Apollo-Target-TestHost-iOS.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = "Tests/TestHost iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.TestHost; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; }; name = Release; }; 9FEFCFCD1E6C65CE0061834C /* PerformanceTesting */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D08224333DA00FC2E54 /* Apollo-Project-Performance-Testing.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = ""; - VERSION_INFO_PREFIX = ""; }; name = PerformanceTesting; }; 9FEFCFCE1E6C65CE0061834C /* PerformanceTesting */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D06224333DA00FC2E54 /* Apollo-Target-Framework.xcconfig */; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DEFINES_MODULE = YES; - ENABLE_TESTABILITY = YES; - INFOPLIST_FILE = Sources/Apollo/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.Apollo; - PRODUCT_NAME = Apollo; }; name = PerformanceTesting; }; 9FEFCFCF1E6C65CE0061834C /* PerformanceTesting */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D2422433C8000FC2E54 /* Apollo-Target-PerformanceTests.xcconfig */; buildSettings = { - INFOPLIST_FILE = Tests/ApolloPerformanceTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloPerformanceTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestHost iOS.app/TestHost iOS"; }; name = PerformanceTesting; }; 9FEFCFD01E6C65CE0061834C /* PerformanceTesting */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D0B2243345500FC2E54 /* Apollo-Target-Tests.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = Tests/ApolloTests/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollostack.ApolloTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = PerformanceTesting; }; 9FEFCFD61E6C65CE0061834C /* PerformanceTesting */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9F98C84D1EC085C400FFD919 /* Framework.xcconfig */; + baseConfigurationReference = 90690D2122433C1900FC2E54 /* Apollo-Target-StarWarsAPI.xcconfig */; buildSettings = { - DEFINES_MODULE = YES; - INFOPLIST_FILE = Tests/StarWarsAPI/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.StarWarsAPI; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = PerformanceTesting; }; 9FEFCFD71E6C65CE0061834C /* PerformanceTesting */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D142243363D00FC2E54 /* Apollo-Target-TestHost-iOS.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = "Tests/TestHost iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.TestHost; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; }; name = PerformanceTesting; }; diff --git a/Apollo.xcworkspace/contents.xcworkspacedata b/Apollo.xcworkspace/contents.xcworkspacedata index 683976ca83..d3ab1c5aea 100644 --- a/Apollo.xcworkspace/contents.xcworkspacedata +++ b/Apollo.xcworkspace/contents.xcworkspacedata @@ -10,4 +10,7 @@ + + diff --git a/ApolloSQLite.xcodeproj/project.pbxproj b/ApolloSQLite.xcodeproj/project.pbxproj index a13f5058be..55fa5bc3a5 100644 --- a/ApolloSQLite.xcodeproj/project.pbxproj +++ b/ApolloSQLite.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 5438069A1EA56C2200F55B72 /* ApolloSQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54DDB0BE1EA1523E0009DD99 /* ApolloSQLite.framework */; }; - 54DDB1091EA53FD30009DD99 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54DDB0EA1EA1573C0009DD99 /* SQLite.framework */; }; 54DDB1AF1EA54F7E0009DD99 /* SQLiteNormalizedCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DDB1AD1EA54F770009DD99 /* SQLiteNormalizedCache.swift */; }; 9F26433B2074BADA00A4519E /* Apollo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F26433A2074BADA00A4519E /* Apollo.framework */; }; 9F37A05320A3E5CC0009A911 /* StarWarsAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F37A05220A3E5CC0009A911 /* StarWarsAPI.framework */; }; @@ -98,6 +97,11 @@ 54DDB0BE1EA1523E0009DD99 /* ApolloSQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ApolloSQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 54DDB0DF1EA1573C0009DD99 /* SQLite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SQLite.xcodeproj; path = Carthage/Checkouts/SQLite.swift/SQLite.xcodeproj; sourceTree = ""; }; 54DDB1AD1EA54F770009DD99 /* SQLiteNormalizedCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteNormalizedCache.swift; sourceTree = ""; }; + 90690D0E224334D600FC2E54 /* ApolloSQLite-Project-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloSQLite-Project-Debug.xcconfig"; sourceTree = ""; }; + 90690D0F224334DD00FC2E54 /* ApolloSQLite-Project-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloSQLite-Project-Release.xcconfig"; sourceTree = ""; }; + 90690D10224334EC00FC2E54 /* ApolloSQLite-Target-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloSQLite-Target-Framework.xcconfig"; sourceTree = ""; }; + 90690D11224334F200FC2E54 /* ApolloSQLite-Target-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloSQLite-Target-Tests.xcconfig"; sourceTree = ""; }; + 90690D262243404B00FC2E54 /* ApolloSQLite-Target-TestSupport.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloSQLite-Target-TestSupport.xcconfig"; sourceTree = ""; }; 9F26433A2074BADA00A4519E /* Apollo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Apollo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F37A05220A3E5CC0009A911 /* StarWarsAPI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StarWarsAPI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F65B1271EC1B4080090B25F /* ApolloSQLiteTestSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ApolloSQLiteTestSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -105,7 +109,6 @@ 9F65B12A1EC1B4080090B25F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9F65B13C1EC1B59E0090B25F /* TestCacheProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestCacheProvider.swift; sourceTree = ""; }; 9F98C8351EC0844E00FFD919 /* CachePersistenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CachePersistenceTests.swift; sourceTree = ""; }; - 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = SOURCE_ROOT; }; 9FA86C5A1EA7B6D40073E1ED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9FA86C5C1EA7B6EE0073E1ED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9FDE0D992074C78D003C2223 /* ApolloTestSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ApolloTestSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -127,7 +130,6 @@ buildActionMask = 2147483647; files = ( 9F26433B2074BADA00A4519E /* Apollo.framework in Frameworks */, - 54DDB1091EA53FD30009DD99 /* SQLite.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -148,8 +150,8 @@ children = ( 54DDB0C01EA1523E0009DD99 /* ApolloSQLite */, 54DDB1AA1EA54AD30009DD99 /* Tests */, + 90690D09224333F800FC2E54 /* Configuration */, 9FA86C581EA7B6780073E1ED /* Frameworks */, - 9FA86C571EA7B6320073E1ED /* Configuration */, 54DDB0BF1EA1523E0009DD99 /* Products */, ); sourceTree = ""; @@ -197,6 +199,19 @@ path = Tests; sourceTree = ""; }; + 90690D09224333F800FC2E54 /* Configuration */ = { + isa = PBXGroup; + children = ( + 90690D0E224334D600FC2E54 /* ApolloSQLite-Project-Debug.xcconfig */, + 90690D0F224334DD00FC2E54 /* ApolloSQLite-Project-Release.xcconfig */, + 90690D10224334EC00FC2E54 /* ApolloSQLite-Target-Framework.xcconfig */, + 90690D11224334F200FC2E54 /* ApolloSQLite-Target-Tests.xcconfig */, + 90690D262243404B00FC2E54 /* ApolloSQLite-Target-TestSupport.xcconfig */, + ); + name = Configuration; + path = Configuration/ApolloSQLite; + sourceTree = ""; + }; 9F65B1281EC1B4080090B25F /* ApolloSQLiteTestSupport */ = { isa = PBXGroup; children = ( @@ -216,14 +231,6 @@ path = ApolloSQLiteTests; sourceTree = ""; }; - 9FA86C571EA7B6320073E1ED /* Configuration */ = { - isa = PBXGroup; - children = ( - 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */, - ); - name = Configuration; - sourceTree = ""; - }; 9FA86C581EA7B6780073E1ED /* Frameworks */ = { isa = PBXGroup; children = ( @@ -238,13 +245,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 54DDB0BB1EA1523E0009DD99 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9F65B1241EC1B4080090B25F /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -262,7 +262,6 @@ buildPhases = ( 543806911EA56C2200F55B72 /* Sources */, 543806921EA56C2200F55B72 /* Frameworks */, - 543806931EA56C2200F55B72 /* Resources */, ); buildRules = ( ); @@ -281,8 +280,6 @@ buildPhases = ( 54DDB0B91EA1523E0009DD99 /* Sources */, 54DDB0BA1EA1523E0009DD99 /* Frameworks */, - 54DDB0BB1EA1523E0009DD99 /* Headers */, - 54DDB0BC1EA1523E0009DD99 /* Resources */, ); buildRules = ( ); @@ -300,7 +297,6 @@ 9F65B1221EC1B4080090B25F /* Sources */, 9F65B1231EC1B4080090B25F /* Frameworks */, 9F65B1241EC1B4080090B25F /* Headers */, - 9F65B1251EC1B4080090B25F /* Resources */, ); buildRules = ( ); @@ -342,6 +338,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 54DDB0B41EA1523E0009DD99; @@ -414,30 +411,6 @@ }; /* End PBXReferenceProxy section */ -/* Begin PBXResourcesBuildPhase section */ - 543806931EA56C2200F55B72 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 54DDB0BC1EA1523E0009DD99 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9F65B1251EC1B4080090B25F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 543806911EA56C2200F55B72 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -486,210 +459,57 @@ /* Begin XCBuildConfiguration section */ 5438069E1EA56C2200F55B72 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */; + baseConfigurationReference = 90690D11224334F200FC2E54 /* ApolloSQLite-Target-Tests.xcconfig */; buildSettings = { - INFOPLIST_FILE = Tests/ApolloSQLiteTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloSQLiteIOSTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 5438069F1EA56C2200F55B72 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */; + baseConfigurationReference = 90690D11224334F200FC2E54 /* ApolloSQLite-Target-Tests.xcconfig */; buildSettings = { - INFOPLIST_FILE = Tests/ApolloSQLiteTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloSQLiteIOSTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 54DDB0C41EA1523E0009DD99 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D0E224334D600FC2E54 /* ApolloSQLite-Project-Debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 54DDB0C51EA1523E0009DD99 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D0F224334DD00FC2E54 /* ApolloSQLite-Project-Release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 54DDB0C71EA1523E0009DD99 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */; + baseConfigurationReference = 90690D10224334EC00FC2E54 /* ApolloSQLite-Target-Framework.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/ApolloSQLite/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloSQLite; - PRODUCT_NAME = ApolloSQLite; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 54DDB0C81EA1523E0009DD99 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */; + baseConfigurationReference = 90690D10224334EC00FC2E54 /* ApolloSQLite-Target-Framework.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/ApolloSQLite/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloSQLite; - PRODUCT_NAME = ApolloSQLite; - SKIP_INSTALL = YES; }; name = Release; }; 9F65B12C1EC1B4080090B25F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */; + baseConfigurationReference = 90690D262243404B00FC2E54 /* ApolloSQLite-Target-TestSupport.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Tests/ApolloSQLiteTestSupport/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloSQLiteTestSupport; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 9F65B12D1EC1B4080090B25F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FA4FD6A1EA7B35200635987 /* Framework.xcconfig */; + baseConfigurationReference = 90690D262243404B00FC2E54 /* ApolloSQLite-Target-TestSupport.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Tests/ApolloSQLiteTestSupport/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloSQLiteTestSupport; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; diff --git a/ApolloWebSocket.xcodeproj/project.pbxproj b/ApolloWebSocket.xcodeproj/project.pbxproj index b2660bc852..5c5b6fd19e 100644 --- a/ApolloWebSocket.xcodeproj/project.pbxproj +++ b/ApolloWebSocket.xcodeproj/project.pbxproj @@ -44,18 +44,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 720F14A9206ADB9000D061DB /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 720160CB206AB3D30052B2EE /* ApolloWebSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ApolloWebSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 720160D4206AB3D30052B2EE /* ApolloWebSocketTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ApolloWebSocketTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -67,11 +55,14 @@ 72707473206D112900C131F6 /* MockWebSocketTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockWebSocketTests.swift; sourceTree = ""; }; 72707474206D112900C131F6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 72707475206D112900C131F6 /* StarWarsWebSocketTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StarWarsWebSocketTests.swift; sourceTree = ""; }; + 90690D0C224334C000FC2E54 /* ApolloWebSocket-Project-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloWebSocket-Project-Debug.xcconfig"; sourceTree = ""; }; + 90690D0D224334C900FC2E54 /* ApolloWebSocket-Project-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloWebSocket-Project-Release.xcconfig"; sourceTree = ""; }; + 90690D12224334FD00FC2E54 /* ApolloWebSocket-Target-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloWebSocket-Target-Framework.xcconfig"; sourceTree = ""; }; + 90690D132243350400FC2E54 /* ApolloWebSocket-Target-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ApolloWebSocket-Target-Tests.xcconfig"; sourceTree = ""; }; 9F28B6C6206E487200144A00 /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 9F28B6D420720F2F00144A00 /* Apollo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Apollo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F28B6D820720FD100144A00 /* ApolloTestSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ApolloTestSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F28B6DA2072101200144A00 /* StarWarsAPI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StarWarsAPI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9FCEC848206E442000FB34B6 /* Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -102,8 +93,8 @@ children = ( 72707469206D111A00C131F6 /* ApolloWebSocket */, 72707470206D112900C131F6 /* ApolloWebSocketTests */, + 90690D0A2243342000FC2E54 /* Configuration */, 720F147A206AB52F00D061DB /* Frameworks */, - 9F0733C7206E191800C2AC65 /* Configuration */, 720160CC206AB3D30052B2EE /* Products */, ); sourceTree = ""; @@ -152,12 +143,16 @@ path = Tests/ApolloWebSocketTests; sourceTree = ""; }; - 9F0733C7206E191800C2AC65 /* Configuration */ = { + 90690D0A2243342000FC2E54 /* Configuration */ = { isa = PBXGroup; children = ( - 9FCEC848206E442000FB34B6 /* Framework.xcconfig */, + 90690D0C224334C000FC2E54 /* ApolloWebSocket-Project-Debug.xcconfig */, + 90690D0D224334C900FC2E54 /* ApolloWebSocket-Project-Release.xcconfig */, + 90690D12224334FD00FC2E54 /* ApolloWebSocket-Target-Framework.xcconfig */, + 90690D132243350400FC2E54 /* ApolloWebSocket-Target-Tests.xcconfig */, ); name = Configuration; + path = Configuration/ApolloWebSocket; sourceTree = ""; }; 9F28B6C7206E487200144A00 /* Products */ = { @@ -171,16 +166,6 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - 720160C8206AB3D30052B2EE /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ 720160CA206AB3D30052B2EE /* ApolloWebSocket */ = { isa = PBXNativeTarget; @@ -188,8 +173,6 @@ buildPhases = ( 720160C6206AB3D30052B2EE /* Sources */, 720160C7206AB3D30052B2EE /* Frameworks */, - 720160C8206AB3D30052B2EE /* Headers */, - 720160C9206AB3D30052B2EE /* Resources */, ); buildRules = ( ); @@ -206,8 +189,6 @@ buildPhases = ( 720160D0206AB3D30052B2EE /* Sources */, 720160D1206AB3D30052B2EE /* Frameworks */, - 720160D2206AB3D30052B2EE /* Resources */, - 720F14A9206ADB9000D061DB /* CopyFiles */, ); buildRules = ( ); @@ -281,23 +262,6 @@ }; /* End PBXReferenceProxy section */ -/* Begin PBXResourcesBuildPhase section */ - 720160C9206AB3D30052B2EE /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 720160D2206AB3D30052B2EE /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 720160C6206AB3D30052B2EE /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -332,197 +296,43 @@ /* Begin XCBuildConfiguration section */ 720160DD206AB3D30052B2EE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D0C224334C000FC2E54 /* ApolloWebSocket-Project-Debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 720160DE206AB3D30052B2EE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 90690D0D224334C900FC2E54 /* ApolloWebSocket-Project-Release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - "FRAMEWORK_SEARCH_PATHS[arch=*]" = ""; - GCC_C_LANGUAGE_STANDARD = gnu11; - 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; - GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 720160E0206AB3D30052B2EE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FCEC848206E442000FB34B6 /* Framework.xcconfig */; + baseConfigurationReference = 90690D12224334FD00FC2E54 /* ApolloWebSocket-Target-Framework.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - INFOPLIST_FILE = "$(SRCROOT)/Sources/ApolloWebSocket/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloWebSocket; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = Debug; }; 720160E1206AB3D30052B2EE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FCEC848206E442000FB34B6 /* Framework.xcconfig */; + baseConfigurationReference = 90690D12224334FD00FC2E54 /* ApolloWebSocket-Target-Framework.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - "FRAMEWORK_SEARCH_PATHS[arch=*]" = ""; - INFOPLIST_FILE = "$(SRCROOT)/Sources/ApolloWebSocket/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloWebSocket; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; }; name = Release; }; 720160E3206AB3D30052B2EE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FCEC848206E442000FB34B6 /* Framework.xcconfig */; + baseConfigurationReference = 90690D132243350400FC2E54 /* ApolloWebSocket-Target-Tests.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - INFOPLIST_FILE = "$(SRCROOT)/Tests/ApolloWebSocketTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloWebSocketTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4"; }; name = Debug; }; 720160E4206AB3D30052B2EE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9FCEC848206E442000FB34B6 /* Framework.xcconfig */; + baseConfigurationReference = 90690D132243350400FC2E54 /* ApolloWebSocket-Target-Tests.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - INFOPLIST_FILE = "$(SRCROOT)/Tests/ApolloWebSocketTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.ApolloWebSocketTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4"; }; name = Release; }; diff --git a/Configuration/Apollo/Apollo-Project-Debug.xcconfig b/Configuration/Apollo/Apollo-Project-Debug.xcconfig new file mode 100644 index 0000000000..96f6ca2629 --- /dev/null +++ b/Configuration/Apollo/Apollo-Project-Debug.xcconfig @@ -0,0 +1 @@ +#include "../Shared/Project-Debug.xcconfig" diff --git a/Configuration/Apollo/Apollo-Project-Performance-Testing.xcconfig b/Configuration/Apollo/Apollo-Project-Performance-Testing.xcconfig new file mode 100644 index 0000000000..f447c6d3cc --- /dev/null +++ b/Configuration/Apollo/Apollo-Project-Performance-Testing.xcconfig @@ -0,0 +1,4 @@ +#include "../Shared/Project-Release.xcconfig" + +ENABLE_TESTABILITY = YES +TEST_HOST = $(BUILT_PRODUCTS_DIR)/TestHost iOS.app/TestHost iOS diff --git a/Configuration/Apollo/Apollo-Project-Release.xcconfig b/Configuration/Apollo/Apollo-Project-Release.xcconfig new file mode 100644 index 0000000000..364f240d89 --- /dev/null +++ b/Configuration/Apollo/Apollo-Project-Release.xcconfig @@ -0,0 +1 @@ +#include "../Shared/Project-Release.xcconfig" diff --git a/Configuration/Apollo/Apollo-Target-CacheDependentTests.xcconfig b/Configuration/Apollo/Apollo-Target-CacheDependentTests.xcconfig new file mode 100644 index 0000000000..87d472f37b --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-CacheDependentTests.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Test.xcconfig" + +INFOPLIST_FILE = Tests/ApolloCacheDependentTests/Info.plist diff --git a/Configuration/Apollo/Apollo-Target-Framework.xcconfig b/Configuration/Apollo/Apollo-Target-Framework.xcconfig new file mode 100644 index 0000000000..e99c60a3ab --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-Framework.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Sources/Apollo/Info.plist diff --git a/Configuration/Apollo/Apollo-Target-GitHubAPI.xcconfig b/Configuration/Apollo/Apollo-Target-GitHubAPI.xcconfig new file mode 100644 index 0000000000..9e77833a4c --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-GitHubAPI.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Tests/GitHubAPI/Info.plist diff --git a/Configuration/Apollo/Apollo-Target-PerformanceTests.xcconfig b/Configuration/Apollo/Apollo-Target-PerformanceTests.xcconfig new file mode 100644 index 0000000000..28d3d34faa --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-PerformanceTests.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Test.xcconfig" + +INFOPLIST_FILE = Tests/ApolloPerformanceTests/Info.plist diff --git a/Configuration/Apollo/Apollo-Target-StarWarsAPI.xcconfig b/Configuration/Apollo/Apollo-Target-StarWarsAPI.xcconfig new file mode 100644 index 0000000000..364c33f206 --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-StarWarsAPI.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Tests/StarWarsAPI/Info.plist diff --git a/Configuration/Apollo/Apollo-Target-TestHost-iOS.xcconfig b/Configuration/Apollo/Apollo-Target-TestHost-iOS.xcconfig new file mode 100644 index 0000000000..6b371e3b66 --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-TestHost-iOS.xcconfig @@ -0,0 +1,13 @@ +#include "../Shared/Workspace-Target-Application.xcconfig" + +SDKROOT = iphoneos +SUPPORTED_PLATFORMS = iphonesimulator iphoneos + +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +ENABLE_BITCODE = NO + +INFOPLIST_FILE = Tests/TestHost iOS/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(TARGET_NAME) + +ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon diff --git a/Configuration/Apollo/Apollo-Target-TestSupport.xcconfig b/Configuration/Apollo/Apollo-Target-TestSupport.xcconfig new file mode 100644 index 0000000000..c1dbcd4e02 --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-TestSupport.xcconfig @@ -0,0 +1,7 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Tests/ApolloTestSupport/Info.plist + +APPLICATION_EXTENSION_API_ONLY = NO +FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_FRAMEWORKS_DIR) $(PLATFORM_DIR)/Developer/Library/Frameworks +OTHER_LDFLAGS = -weak_framework XCTest -weak-lswiftXCTest diff --git a/Configuration/Apollo/Apollo-Target-Tests.xcconfig b/Configuration/Apollo/Apollo-Target-Tests.xcconfig new file mode 100644 index 0000000000..83f979af1e --- /dev/null +++ b/Configuration/Apollo/Apollo-Target-Tests.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Test.xcconfig" + +INFOPLIST_FILE = Tests/ApolloTests/Info.plist diff --git a/Configuration/ApolloSQLite/ApolloSQLite-Project-Debug.xcconfig b/Configuration/ApolloSQLite/ApolloSQLite-Project-Debug.xcconfig new file mode 100644 index 0000000000..96f6ca2629 --- /dev/null +++ b/Configuration/ApolloSQLite/ApolloSQLite-Project-Debug.xcconfig @@ -0,0 +1 @@ +#include "../Shared/Project-Debug.xcconfig" diff --git a/Configuration/ApolloSQLite/ApolloSQLite-Project-Release.xcconfig b/Configuration/ApolloSQLite/ApolloSQLite-Project-Release.xcconfig new file mode 100644 index 0000000000..364f240d89 --- /dev/null +++ b/Configuration/ApolloSQLite/ApolloSQLite-Project-Release.xcconfig @@ -0,0 +1 @@ +#include "../Shared/Project-Release.xcconfig" diff --git a/Configuration/ApolloSQLite/ApolloSQLite-Target-Framework.xcconfig b/Configuration/ApolloSQLite/ApolloSQLite-Target-Framework.xcconfig new file mode 100644 index 0000000000..efbb58eb04 --- /dev/null +++ b/Configuration/ApolloSQLite/ApolloSQLite-Target-Framework.xcconfig @@ -0,0 +1,4 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Sources/ApolloSQLite/Info.plist +OTHER_LDFLAGS = -framework SQLite diff --git a/Configuration/ApolloSQLite/ApolloSQLite-Target-TestSupport.xcconfig b/Configuration/ApolloSQLite/ApolloSQLite-Target-TestSupport.xcconfig new file mode 100644 index 0000000000..547bf3da63 --- /dev/null +++ b/Configuration/ApolloSQLite/ApolloSQLite-Target-TestSupport.xcconfig @@ -0,0 +1,7 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Tests/ApolloSQLiteTestSupport/Info.plist + +APPLICATION_EXTENSION_API_ONLY = NO +FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_FRAMEWORKS_DIR) $(PLATFORM_DIR)/Developer/Library/Frameworks +OTHER_LDFLAGS = -weak_framework XCTest -weak-lswiftXCTest diff --git a/Configuration/ApolloSQLite/ApolloSQLite-Target-Tests.xcconfig b/Configuration/ApolloSQLite/ApolloSQLite-Target-Tests.xcconfig new file mode 100644 index 0000000000..cc977a6368 --- /dev/null +++ b/Configuration/ApolloSQLite/ApolloSQLite-Target-Tests.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Test.xcconfig" + +INFOPLIST_FILE = Tests/ApolloSQLiteTests/Info.plist diff --git a/Configuration/ApolloWebSocket/ApolloWebSocket-Project-Debug.xcconfig b/Configuration/ApolloWebSocket/ApolloWebSocket-Project-Debug.xcconfig new file mode 100644 index 0000000000..96f6ca2629 --- /dev/null +++ b/Configuration/ApolloWebSocket/ApolloWebSocket-Project-Debug.xcconfig @@ -0,0 +1 @@ +#include "../Shared/Project-Debug.xcconfig" diff --git a/Configuration/ApolloWebSocket/ApolloWebSocket-Project-Release.xcconfig b/Configuration/ApolloWebSocket/ApolloWebSocket-Project-Release.xcconfig new file mode 100644 index 0000000000..364f240d89 --- /dev/null +++ b/Configuration/ApolloWebSocket/ApolloWebSocket-Project-Release.xcconfig @@ -0,0 +1 @@ +#include "../Shared/Project-Release.xcconfig" diff --git a/Configuration/ApolloWebSocket/ApolloWebSocket-Target-Framework.xcconfig b/Configuration/ApolloWebSocket/ApolloWebSocket-Target-Framework.xcconfig new file mode 100644 index 0000000000..bf6d204cb8 --- /dev/null +++ b/Configuration/ApolloWebSocket/ApolloWebSocket-Target-Framework.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Framework.xcconfig" + +INFOPLIST_FILE = Sources/ApolloWebSocket/Info.plist diff --git a/Configuration/ApolloWebSocket/ApolloWebSocket-Target-Tests.xcconfig b/Configuration/ApolloWebSocket/ApolloWebSocket-Target-Tests.xcconfig new file mode 100644 index 0000000000..a91bc531e2 --- /dev/null +++ b/Configuration/ApolloWebSocket/ApolloWebSocket-Target-Tests.xcconfig @@ -0,0 +1,3 @@ +#include "../Shared/Workspace-Universal-Test.xcconfig" + +INFOPLIST_FILE = Tests/ApolloWebSocketTests/Info.plist diff --git a/Configuration/Shared/Project-Debug.xcconfig b/Configuration/Shared/Project-Debug.xcconfig new file mode 100644 index 0000000000..ae03656ce4 --- /dev/null +++ b/Configuration/Shared/Project-Debug.xcconfig @@ -0,0 +1 @@ +#include "Workspace-Debug.xcconfig" diff --git a/Configuration/Shared/Project-Release.xcconfig b/Configuration/Shared/Project-Release.xcconfig new file mode 100644 index 0000000000..b266f89403 --- /dev/null +++ b/Configuration/Shared/Project-Release.xcconfig @@ -0,0 +1,5 @@ +#include "Workspace-Release.xcconfig" + +COPY_PHASE_STRIP = YES +DEPLOYMENT_POSTPROCESSING = YES +STRIP_INSTALLED_PRODUCT = YES diff --git a/Version.xcconfig b/Configuration/Shared/Project-Version.xcconfig similarity index 100% rename from Version.xcconfig rename to Configuration/Shared/Project-Version.xcconfig diff --git a/Configuration/Shared/Workspace-Analysis.xcconfig b/Configuration/Shared/Workspace-Analysis.xcconfig new file mode 100644 index 0000000000..f75a82686f --- /dev/null +++ b/Configuration/Shared/Workspace-Analysis.xcconfig @@ -0,0 +1,2 @@ +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE diff --git a/Configuration/Shared/Workspace-Code-Generation.xcconfig b/Configuration/Shared/Workspace-Code-Generation.xcconfig new file mode 100644 index 0000000000..6ecec38c92 --- /dev/null +++ b/Configuration/Shared/Workspace-Code-Generation.xcconfig @@ -0,0 +1,6 @@ +// Code generation +GCC_STRICT_ALIASING = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_SYMBOLS_PRIVATE_EXTERN = NO +GCC_THREADSAFE_STATICS = YES +GCC_NO_COMMON_BLOCKS = YES diff --git a/Configuration/Shared/Workspace-Debug.xcconfig b/Configuration/Shared/Workspace-Debug.xcconfig new file mode 100644 index 0000000000..7640387aa4 --- /dev/null +++ b/Configuration/Shared/Workspace-Debug.xcconfig @@ -0,0 +1,22 @@ +#include "Workspace-Shared.xcconfig" + +// Architectures +ONLY_ACTIVE_ARCH = YES + +// Build Options +ENABLE_TESTABILITY = YES +VALIDATE_PRODUCT = NO + +// Deployment +COPY_PHASE_STRIP = NO + +// Code Generation +GCC_OPTIMIZATION_LEVEL = 0 +SWIFT_OPTIMIZATION_LEVEL = -Onone +LLVM_LTO = NO +SWIFT_COMPILATION_MODE = singlefile + +// Build Options +DEBUG_INFORMATION_FORMAT = dwarf + +ENABLE_NS_ASSERTIONS = YES diff --git a/Configuration/Shared/Workspace-Deployment-Targets.xcconfig b/Configuration/Shared/Workspace-Deployment-Targets.xcconfig new file mode 100644 index 0000000000..033459e386 --- /dev/null +++ b/Configuration/Shared/Workspace-Deployment-Targets.xcconfig @@ -0,0 +1,14 @@ +// Base Deployment Targets +IPHONEOS_DEPLOYMENT_TARGET = 9.0 +MACOSX_DEPLOYMENT_TARGET = 10.10 +TVOS_DEPLOYMENT_TARGET = 9.1 +WATCHOS_DEPLOYMENT_TARGET = 3.0 + +WARNING_CFLAGS[sdk=iphone*] = $(inherited) -DAPI_TO_BE_DEPRECATED=8_0 +WARNING_CFLAGS[sdk=macosx*] = $(inherited) -DAPI_TO_BE_DEPRECATED=10_10 +WARNING_CFLAGS[sdk=tvos*] = $(inherited) -DAPI_TO_BE_DEPRECATED=9_1 +WARNING_CFLAGS[sdk=watchos*] = $(inherited) -DAPI_TO_BE_DEPRECATED=3_0 + +// macOS-specific default settings +COMBINE_HIDPI_IMAGES[sdk=macosx*] = YES + diff --git a/Configuration/Shared/Workspace-Language.xcconfig b/Configuration/Shared/Workspace-Language.xcconfig new file mode 100644 index 0000000000..aa215ad162 --- /dev/null +++ b/Configuration/Shared/Workspace-Language.xcconfig @@ -0,0 +1,24 @@ +// Language +GCC_C_LANGUAGE_STANDARD = gnu99 +GCC_ENABLE_OBJC_EXCEPTIONS = YES +GCC_ENABLE_ASM_KEYWORD = YES +CLANG_LINK_OBJC_RUNTIME = YES +CLANG_ENABLE_OBJC_WEAK = YES + +// ARC enabled +CLANG_ENABLE_OBJC_ARC = YES + +// Enable @import modules support +CLANG_ENABLE_MODULES = YES +CLANG_MODULES_AUTOLINK = YES + +CLANG_CXX_LANGUAGE_STANDARD = gnu++11 +CLANG_CXX_LIBRARY = libc++ + +ENABLE_STRICT_OBJC_MSGSEND = YES + +// Swift +SWIFT_VERSION = 4.2 +SWIFT_PRECOMPILE_BRIDGING_HEADER = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(CONFIGURATION:upper) +SWIFT_SWIFT3_OBJC_INFERENCE = Off diff --git a/Configuration/Shared/Workspace-Linking.xcconfig b/Configuration/Shared/Workspace-Linking.xcconfig new file mode 100644 index 0000000000..14d45fba1e --- /dev/null +++ b/Configuration/Shared/Workspace-Linking.xcconfig @@ -0,0 +1,5 @@ +// Dynamic linking uses different default copy paths. Reset LD_RUNPATH_SEARCH_PATHS for each SDK. +LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = '@executable_path/../Frameworks' '@loader_path/../Frameworks' +LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = '@executable_path/Frameworks' '@loader_path/Frameworks' +LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = '@executable_path/Frameworks' '@loader_path/Frameworks' +LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Configuration/Shared/Workspace-Packaging.xcconfig b/Configuration/Shared/Workspace-Packaging.xcconfig new file mode 100644 index 0000000000..258d789e84 --- /dev/null +++ b/Configuration/Shared/Workspace-Packaging.xcconfig @@ -0,0 +1,4 @@ +PRODUCT_NAME = $(TARGET_NAME) +PRODUCT_BUNDLE_IDENTIFIER = com.apollographql.$(TARGET_NAME:rfc1034identifier) + +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES diff --git a/Configuration/Shared/Workspace-Release.xcconfig b/Configuration/Shared/Workspace-Release.xcconfig new file mode 100644 index 0000000000..db1059c9fd --- /dev/null +++ b/Configuration/Shared/Workspace-Release.xcconfig @@ -0,0 +1,21 @@ +#include "Workspace-Shared.xcconfig" + +// Architectures +ONLY_ACTIVE_ARCH = NO + +// Build Options +VALIDATE_PRODUCT = YES + +// Deployment Options +COPY_PHASE_STRIP = YES + +// Code Generation +GCC_OPTIMIZATION_LEVEL = s +SWIFT_OPTIMIZATION_LEVEL = -O +SWIFT_COMPILATION_MODE = wholemodule +LLVM_LTO = YES + +// Build Options +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym + +ENABLE_NS_ASSERTIONS = NO diff --git a/Configuration/Shared/Workspace-Search-Paths.xcconfig b/Configuration/Shared/Workspace-Search-Paths.xcconfig new file mode 100644 index 0000000000..c6078a25d1 --- /dev/null +++ b/Configuration/Shared/Workspace-Search-Paths.xcconfig @@ -0,0 +1,4 @@ +// Search Paths +ALWAYS_SEARCH_USER_PATHS = NO +HEADER_SEARCH_PATHS = $(inherited) $(CONFIGURATION_BUILD_DIR) +FRAMEWORK_SEARCH_PATHS = $(inherited) $(CONFIGURATION_BUILD_DIR) diff --git a/Configuration/Shared/Workspace-Shared.xcconfig b/Configuration/Shared/Workspace-Shared.xcconfig new file mode 100644 index 0000000000..387301ebdb --- /dev/null +++ b/Configuration/Shared/Workspace-Shared.xcconfig @@ -0,0 +1,12 @@ +#include "Workspace-Analysis.xcconfig" +#include "Workspace-Code-Generation.xcconfig" +#include "Workspace-Deployment-Targets.xcconfig" +#include "Workspace-Language.xcconfig" +#include "Workspace-Linking.xcconfig" +#include "Workspace-Packaging.xcconfig" +#include "Workspace-Search-Paths.xcconfig" +#include "Workspace-Warnings.xcconfig" +#include "Project-Version.xcconfig" + +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(CONFIGURATION:upper)=1 +SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) $(CONFIGURATION:upper) diff --git a/Configuration/Shared/Workspace-Target-Application.xcconfig b/Configuration/Shared/Workspace-Target-Application.xcconfig new file mode 100644 index 0000000000..688b7be118 --- /dev/null +++ b/Configuration/Shared/Workspace-Target-Application.xcconfig @@ -0,0 +1 @@ +WRAPPER_EXTENSION = app diff --git a/Configuration/Shared/Workspace-Target-Framework.xcconfig b/Configuration/Shared/Workspace-Target-Framework.xcconfig new file mode 100644 index 0000000000..f02138d8d1 --- /dev/null +++ b/Configuration/Shared/Workspace-Target-Framework.xcconfig @@ -0,0 +1,15 @@ +WRAPPER_EXTENSION = framework + +INSTALL_PATH = @rpath +LD_DYLIB_INSTALL_NAME = @rpath/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/$(PRODUCT_NAME) +SKIP_INSTALL = YES + +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath + +FRAMEWORK_VERSION[sdk=macosx*] = A + +APPLICATION_EXTENSION_API_ONLY = YES + +DEFINES_MODULE = YES diff --git a/Configuration/Shared/Workspace-Target-Test.xcconfig b/Configuration/Shared/Workspace-Target-Test.xcconfig new file mode 100644 index 0000000000..dc0a41fda4 --- /dev/null +++ b/Configuration/Shared/Workspace-Target-Test.xcconfig @@ -0,0 +1,8 @@ +// Packaging +WRAPPER_EXTENSION = xctest + +// Code Generation +ENABLE_BITCODE = NO + +// Disable some known troublesome warnings for the test target, as -Weverything without these exceptions causes errors when importing XCTest +WARNING_CFLAGS = $(inherited) -Wno-documentation-unknown-command -Wno-incomplete-module -Wno-disabled-macro-expansion -Wno-shadow diff --git a/Configuration/Shared/Workspace-Universal-Framework.xcconfig b/Configuration/Shared/Workspace-Universal-Framework.xcconfig new file mode 100644 index 0000000000..409018d9b3 --- /dev/null +++ b/Configuration/Shared/Workspace-Universal-Framework.xcconfig @@ -0,0 +1,34 @@ +#include "Workspace-Universal-Target.xcconfig" +#include "Workspace-Target-Framework.xcconfig" + +SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvsimulator appletvos watchsimulator watchos macosx + +// iOS-specific default settings +SDKROOT[sdk=iphone*] = iphoneos +VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s +VALID_ARCHS[sdk=iphonesimulator*] = x86_64 i386 +TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2 + +// TV-specific default settings +SDKROOT[sdk=appletv*] = appletvos +TARGETED_DEVICE_FAMILY[sdk=appletv*] = 3 + +// Watch-specific default settings +SDKROOT[sdk=watch*] = watchos +TARGETED_DEVICE_FAMILY[sdk=watch*] = 4 + +// macOS-specific default settings +SDKROOT[sdk=macosx*] = macosx +VALID_ARCHS[sdk=macosx*] = x86_64 + +// Enable Bitcode only for actual devices, not for macOS or simulators +ENABLE_BITCODE[sdk=watchos*] = YES +ENABLE_BITCODE[sdk=iphoneos*] = YES +ENABLE_BITCODE[sdk=appletvos*] = YES + +// By default, BITCODE_GENERATION_MODE is "marker". +// Based on Realm's fix for Bitcode, this needs to be "bitcode" +// Source: https://github.com/realm/realm-cocoa/pull/2567 +BITCODE_GENERATION_MODE[sdk=watchos*] = bitcode +BITCODE_GENERATION_MODE[sdk=iphoneos*] = bitcode +BITCODE_GENERATION_MODE[sdk=appletvos*] = bitcode diff --git a/Configuration/Shared/Workspace-Universal-Target.xcconfig b/Configuration/Shared/Workspace-Universal-Target.xcconfig new file mode 100644 index 0000000000..c1870b6d68 --- /dev/null +++ b/Configuration/Shared/Workspace-Universal-Target.xcconfig @@ -0,0 +1,3 @@ +#include "Workspace-Deployment-Targets.xcconfig" + +SUPPORTED_PLATFORMS = macosx iphonesimulator iphoneos watchos watchsimulator appletvos appletvsimulator diff --git a/Configuration/Shared/Workspace-Universal-Test.xcconfig b/Configuration/Shared/Workspace-Universal-Test.xcconfig new file mode 100644 index 0000000000..0ac69c2fa3 --- /dev/null +++ b/Configuration/Shared/Workspace-Universal-Test.xcconfig @@ -0,0 +1,2 @@ +#include "Workspace-Universal-Target.xcconfig" +#include "Workspace-Target-Test.xcconfig" diff --git a/Configuration/Shared/Workspace-Warnings.xcconfig b/Configuration/Shared/Workspace-Warnings.xcconfig new file mode 100644 index 0000000000..75f73f2245 --- /dev/null +++ b/Configuration/Shared/Workspace-Warnings.xcconfig @@ -0,0 +1,27 @@ +CLANG_ANALYZER_NONNULL = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = 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 +GCC_WARN_UNUSED_VARIABLE = YES diff --git a/Framework.xcconfig b/Framework.xcconfig deleted file mode 100644 index 8af2e77263..0000000000 --- a/Framework.xcconfig +++ /dev/null @@ -1,29 +0,0 @@ -#include "Version.xcconfig" - -INSTALL_PATH = @rpath -LD_DYLIB_INSTALL_NAME = @rpath/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/$(PRODUCT_NAME) -SKIP_INSTALL = YES - -SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvsimulator appletvos watchsimulator watchos macosx - -SDKROOT[sdk=iphone*] = iphoneos -VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s -VALID_ARCHS[sdk=iphonesimulator*] = x86_64 i386 -IPHONEOS_DEPLOYMENT_TARGET = 9.0 -TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2 -LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks - -SDKROOT[sdk=appletv*] = appletvos -TVOS_DEPLOYMENT_TARGET = 9.1 -TARGETED_DEVICE_FAMILY[sdk=appletv*] = 3 -LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks - -SDKROOT[sdk=watch*] = watchos -WATCHOS_DEPLOYMENT_TARGET = 3.0 -TARGETED_DEVICE_FAMILY[sdk=watch*] = 4 -LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks - -SDKROOT[sdk=macosx*] = macosx -VALID_ARCHS[sdk=macosx*] = x86_64 -MACOSX_DEPLOYMENT_TARGET = 10.10 -LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks diff --git a/scripts/version-constants.sh b/scripts/version-constants.sh index e0769943ff..ca550b7c2d 100644 --- a/scripts/version-constants.sh +++ b/scripts/version-constants.sh @@ -1,2 +1,2 @@ VERSION_CONFIG_VAR="CURRENT_PROJECT_VERSION" -VERSION_CONFIG_FILE="Version.xcconfig" +VERSION_CONFIG_FILE="Configuration/Shared/Project-Version.xcconfig" From 40c6ee680900232a73eab7513ea024fbe3f14261 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Thu, 21 Mar 2019 14:58:16 +1100 Subject: [PATCH 2/5] `defaultRunLoopMode` has been renamed to `default` in Swift 4.2 --- Tests/ApolloCacheDependentTests/WatchQueryTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/ApolloCacheDependentTests/WatchQueryTests.swift b/Tests/ApolloCacheDependentTests/WatchQueryTests.swift index a9bcf8c1e5..00e66e4013 100644 --- a/Tests/ApolloCacheDependentTests/WatchQueryTests.swift +++ b/Tests/ApolloCacheDependentTests/WatchQueryTests.swift @@ -324,7 +324,7 @@ class WatchQueryTests: XCTestCase { let untilDate = Date(timeIntervalSinceNow: timeInterval) while untilDate.timeIntervalSinceNow > 0 { - RunLoop.current.run(mode: .defaultRunLoopMode, before: untilDate) + RunLoop.current.run(mode: .default, before: untilDate) } } } From af0db1a4ce93af837176172239a41afdb6a5da61 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Thu, 21 Mar 2019 22:06:34 +1100 Subject: [PATCH 3/5] Add a script to ensure that build settings are not erroneously added to the Xcode project file # Conflicts: # ApolloWebSocket.xcodeproj/project.pbxproj # Conflicts: # ApolloSQLite.xcodeproj/project.pbxproj --- Apollo.xcodeproj/project.pbxproj | 19 ++++++++++++++++ ApolloSQLite.xcodeproj/project.pbxproj | 22 +++++++++++++++++++ ApolloWebSocket.xcodeproj/project.pbxproj | 22 +++++++++++++++++++ .../ensure-no-build-settings-in-pbxproj.sh | 18 +++++++++++++++ 4 files changed, 81 insertions(+) create mode 100755 scripts/ensure-no-build-settings-in-pbxproj.sh diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj index eeab20de68..976bb949c0 100644 --- a/Apollo.xcodeproj/project.pbxproj +++ b/Apollo.xcodeproj/project.pbxproj @@ -789,6 +789,7 @@ isa = PBXNativeTarget; buildConfigurationList = 9FC750581D2A532D00458D91 /* Build configuration list for PBXNativeTarget "Apollo" */; buildPhases = ( + 90690D322243442F00FC2E54 /* Ensure no build settings are in the Xcode project */, 9FC7503F1D2A532C00458D91 /* Sources */, 9FC750411D2A532C00458D91 /* Headers */, 9FC750421D2A532C00458D91 /* Resources */, @@ -961,6 +962,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 90690D322243442F00FC2E54 /* Ensure no build settings are in the Xcode project */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Ensure no build settings are in the Xcode project"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$SRCROOT\"/scripts/ensure-no-build-settings-in-pbxproj.sh \"${PROJECT_FILE_PATH}\"\n"; + }; 9FACA9BA1F42E67200AE2DBD /* Generate Apollo Client API */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/ApolloSQLite.xcodeproj/project.pbxproj b/ApolloSQLite.xcodeproj/project.pbxproj index 55fa5bc3a5..cd2e722df9 100644 --- a/ApolloSQLite.xcodeproj/project.pbxproj +++ b/ApolloSQLite.xcodeproj/project.pbxproj @@ -278,6 +278,7 @@ isa = PBXNativeTarget; buildConfigurationList = 54DDB0C61EA1523E0009DD99 /* Build configuration list for PBXNativeTarget "ApolloSQLite" */; buildPhases = ( + 90690D362243444D00FC2E54 /* Ensure no build settings are in the Xcode project */, 54DDB0B91EA1523E0009DD99 /* Sources */, 54DDB0BA1EA1523E0009DD99 /* Frameworks */, ); @@ -411,6 +412,27 @@ }; /* End PBXReferenceProxy section */ +/* Begin PBXShellScriptBuildPhase section */ + 90690D362243444D00FC2E54 /* Ensure no build settings are in the Xcode project */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Ensure no build settings are in the Xcode project"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$SRCROOT\"/scripts/ensure-no-build-settings-in-pbxproj.sh \"${PROJECT_FILE_PATH}\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 543806911EA56C2200F55B72 /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/ApolloWebSocket.xcodeproj/project.pbxproj b/ApolloWebSocket.xcodeproj/project.pbxproj index 5c5b6fd19e..e82645bcab 100644 --- a/ApolloWebSocket.xcodeproj/project.pbxproj +++ b/ApolloWebSocket.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ isa = PBXNativeTarget; buildConfigurationList = 720160DF206AB3D30052B2EE /* Build configuration list for PBXNativeTarget "ApolloWebSocket" */; buildPhases = ( + 90690D332243444400FC2E54 /* Ensure no build settings are in the Xcode project */, 720160C6206AB3D30052B2EE /* Sources */, 720160C7206AB3D30052B2EE /* Frameworks */, ); @@ -262,6 +263,27 @@ }; /* End PBXReferenceProxy section */ +/* Begin PBXShellScriptBuildPhase section */ + 90690D332243444400FC2E54 /* Ensure no build settings are in the Xcode project */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Ensure no build settings are in the Xcode project"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$SRCROOT\"/scripts/ensure-no-build-settings-in-pbxproj.sh \"${PROJECT_FILE_PATH}\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 720160C6206AB3D30052B2EE /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/scripts/ensure-no-build-settings-in-pbxproj.sh b/scripts/ensure-no-build-settings-in-pbxproj.sh new file mode 100755 index 0000000000..eb21028de0 --- /dev/null +++ b/scripts/ensure-no-build-settings-in-pbxproj.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +PROJECT_PATH=${1} +if [ -z "${PROJECT_PATH}" ]; then + echo "Project path not specified." + exit 1 +fi + +PROJECT_FILE_PATH="${PROJECT_PATH}/project.pbxproj" +NUMBER_OF_BUILD_SETTINGS=`grep "buildSettings" "$PROJECT_FILE_PATH" | wc -l` +NUMBER_OF_EMPTY_BUILD_SETTINGS=`grep -B 0 -A 1 "buildSettings" "$PROJECT_FILE_PATH" | grep "};" | wc -l` + +if [ $NUMBER_OF_BUILD_SETTINGS != $NUMBER_OF_EMPTY_BUILD_SETTINGS ]; then + NUMBER_WITH_SETTINGS=`expr $NUMBER_OF_BUILD_SETTINGS - $NUMBER_OF_EMPTY_BUILD_SETTINGS` + + echo "${PROJECT_PATH}: error: Found ${NUMBER_WITH_SETTINGS} build settings in Xcode project file. Build settings should only be defined in .xcconfig files." + exit 1 +fi From 0af7df8e99d752c672812601f0d2f4fee2d6a6e0 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Thu, 21 Mar 2019 22:09:53 +1100 Subject: [PATCH 4/5] Bump TravisCI build environment to build using Xcode 10.2 --- .travis.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2cfecf106..ea68a4475a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode10 +osx_image: xcode10.2 xcode_workspace: Apollo.xcworkspace matrix: @@ -8,49 +8,49 @@ matrix: xcode_sdk: macosx10.14 env: DESTINATION="platform=macOS,arch=x86_64" - xcode_scheme: Apollo - xcode_sdk: iphonesimulator12.0 - env: DESTINATION="platform=iOS Simulator,OS=12.0,name=iPhone XS" + xcode_sdk: iphonesimulator12.2 + env: DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone XS" - xcode_scheme: Apollo - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=11.4,name=iPhone 8" - xcode_scheme: Apollo - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7" - xcode_scheme: Apollo - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s" - xcode_scheme: Apollo - xcode_sdk: appletvsimulator12.0 - env: DESTINATION="platform=tvOS Simulator,OS=12.0,name=Apple TV" + xcode_sdk: appletvsimulator12.2 + env: DESTINATION="platform=tvOS Simulator,OS=12.2,name=Apple TV" - xcode_scheme: ApolloSQLite xcode_sdk: macosx10.14 env: DESTINATION="platform=macOS,arch=x86_64" - xcode_scheme: ApolloSQLite - xcode_sdk: iphonesimulator12.0 - env: DESTINATION="platform=iOS Simulator,OS=12.0,name=iPhone XS" + xcode_sdk: iphonesimulator12.2 + env: DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone XS" - xcode_scheme: ApolloSQLite - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=11.4,name=iPhone 8" - xcode_scheme: ApolloSQLite - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7" - xcode_scheme: ApolloSQLite - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s" - xcode_scheme: ApolloWebSocket xcode_sdk: macosx10.14 env: DESTINATION="platform=macOS,arch=x86_64" - xcode_scheme: ApolloWebSocket - xcode_sdk: iphonesimulator12.0 - env: DESTINATION="platform=iOS Simulator,OS=12.0,name=iPhone XS" + xcode_sdk: iphonesimulator12.2 + env: DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone XS" - xcode_scheme: ApolloWebSocket - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=11.4,name=iPhone 8" - xcode_scheme: ApolloWebSocket - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7" - xcode_scheme: ApolloWebSocket - xcode_sdk: iphonesimulator12.0 + xcode_sdk: iphonesimulator12.2 env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s" cache: From 5c1b3dad53617c3bec7b637a2bee858f4e9a91e0 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Thu, 21 Mar 2019 15:35:17 +1100 Subject: [PATCH 5/5] Bump swift-version file to 4.2 --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index 5186d07068..bf77d54968 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2