From 0ad9a540721abc2b4cbec23425ce944434b12ab2 Mon Sep 17 00:00:00 2001 From: Artur Grigor Date: Fri, 18 Aug 2017 13:50:53 +0300 Subject: [PATCH] Fixed the Tests target. --- .travis.yml | 6 +- AwaitKit.xcodeproj/project.pbxproj | 204 ++++++++---------- .../xcshareddata/xcschemes/AwaitKit.xcscheme | 7 +- Tests/AwaitKitAsyncTests.swift | 1 + Tests/AwaitKitAwaitTests.swift | 1 + Tests/AwaitKitTests.swift | 1 + 6 files changed, 98 insertions(+), 122 deletions(-) diff --git a/.travis.yml b/.travis.yml index eedc6d3..24d36e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,14 +22,14 @@ script: # Build Framework in Debug and Run Tests if specified - if [ $RUN_TESTS == "YES" ]; then - travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty; + travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" GCC_GENERATE_TEST_COVERAGE_FILES=YES -enableCodeCoverage YES test | xcpretty; else - travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty; + travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug build | xcpretty; fi # Build Framework in Release and Run Tests if specified - if [ $RUN_TESTS == "YES" ]; then - travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty; + travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" GCC_GENERATE_TEST_COVERAGE_FILES=YES -enableCodeCoverage YES test | xcpretty; else travis_retry xcodebuild -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty; fi diff --git a/AwaitKit.xcodeproj/project.pbxproj b/AwaitKit.xcodeproj/project.pbxproj index 7195b62..aaac33d 100644 --- a/AwaitKit.xcodeproj/project.pbxproj +++ b/AwaitKit.xcodeproj/project.pbxproj @@ -11,15 +11,11 @@ FE41FCDE1F46D9AC00CD2271 /* AwaitKitExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD31F46D9A700CD2271 /* AwaitKitExtension.swift */; }; FE41FCDF1F46D9AC00CD2271 /* DispatchQueue+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD41F46D9A700CD2271 /* DispatchQueue+Async.swift */; }; FE41FCE01F46D9AC00CD2271 /* DispatchQueue+Await.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD51F46D9A700CD2271 /* DispatchQueue+Await.swift */; }; - FE41FCF41F46D9DD00CD2271 /* AwaitKitAsyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCF11F46D9DB00CD2271 /* AwaitKitAsyncTests.swift */; }; - FE41FCF51F46D9DD00CD2271 /* AwaitKitAwaitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCF21F46D9DB00CD2271 /* AwaitKitAwaitTests.swift */; }; - FE41FCF61F46D9DD00CD2271 /* AwaitKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCF31F46D9DB00CD2271 /* AwaitKitTests.swift */; }; - FE41FD141F46DB0700CD2271 /* AwaitKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD21F46D9A700CD2271 /* AwaitKit.swift */; }; - FE41FD151F46DB0700CD2271 /* AwaitKitExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD31F46D9A700CD2271 /* AwaitKitExtension.swift */; }; - FE41FD161F46DB0700CD2271 /* DispatchQueue+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD41F46D9A700CD2271 /* DispatchQueue+Async.swift */; }; - FE41FD171F46DB0700CD2271 /* DispatchQueue+Await.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCD51F46D9A700CD2271 /* DispatchQueue+Await.swift */; }; FE41FD201F46DB6800CD2271 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE41FD061F46DA7800CD2271 /* PromiseKit.framework */; }; - FEF014801E39E4CE00C4A60B /* AwaitKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEF0141E1E39E12200C4A60B /* AwaitKit.framework */; }; + FE41FD651F46F1C300CD2271 /* AwaitKitAsyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCF11F46D9DB00CD2271 /* AwaitKitAsyncTests.swift */; }; + FE41FD661F46F1C300CD2271 /* AwaitKitAwaitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCF21F46D9DB00CD2271 /* AwaitKitAwaitTests.swift */; }; + FE41FD671F46F1C300CD2271 /* AwaitKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE41FCF31F46D9DB00CD2271 /* AwaitKitTests.swift */; }; + FE41FD6B1F46F1F600CD2271 /* AwaitKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEF0141E1E39E12200C4A60B /* AwaitKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -65,12 +61,12 @@ remoteGlobalIDString = 63B0AC561D595E1B00FA21D9; remoteInfo = PromiseKit; }; - FEF014811E39E4CE00C4A60B /* PBXContainerItemProxy */ = { + FE41FD681F46F1E600CD2271 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FEF014151E39E12200C4A60B /* Project object */; proxyType = 1; remoteGlobalIDString = FEF0141D1E39E12200C4A60B; - remoteInfo = "AwaitKit iOS"; + remoteInfo = AwaitKit; }; /* End PBXContainerItemProxy section */ @@ -85,24 +81,24 @@ FE41FCF21F46D9DB00CD2271 /* AwaitKitAwaitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AwaitKitAwaitTests.swift; sourceTree = ""; }; FE41FCF31F46D9DB00CD2271 /* AwaitKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AwaitKitTests.swift; sourceTree = ""; }; FE41FCFD1F46DA7800CD2271 /* PromiseKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PromiseKit.xcodeproj; path = Carthage/Checkouts/PromiseKit/PromiseKit.xcodeproj; sourceTree = ""; }; + FE41FD5D1F46F19F00CD2271 /* AwaitKit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AwaitKit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; FEF0141E1E39E12200C4A60B /* AwaitKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AwaitKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FEF0147B1E39E4CE00C4A60B /* AwaitKit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AwaitKit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - FEF0141A1E39E12200C4A60B /* Frameworks */ = { + FE41FD5A1F46F19F00CD2271 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FE41FD201F46DB6800CD2271 /* PromiseKit.framework in Frameworks */, + FE41FD6B1F46F1F600CD2271 /* AwaitKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - FEF014781E39E4CE00C4A60B /* Frameworks */ = { + FEF0141A1E39E12200C4A60B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FEF014801E39E4CE00C4A60B /* AwaitKit.framework in Frameworks */, + FE41FD201F46DB6800CD2271 /* PromiseKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -158,7 +154,7 @@ isa = PBXGroup; children = ( FEF0141E1E39E12200C4A60B /* AwaitKit.framework */, - FEF0147B1E39E4CE00C4A60B /* AwaitKit Tests.xctest */, + FE41FD5D1F46F19F00CD2271 /* AwaitKit Tests.xctest */, ); name = Products; sourceTree = ""; @@ -176,6 +172,23 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + FE41FD5C1F46F19F00CD2271 /* AwaitKit Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = FE41FD621F46F19F00CD2271 /* Build configuration list for PBXNativeTarget "AwaitKit Tests" */; + buildPhases = ( + FE41FD591F46F19F00CD2271 /* Sources */, + FE41FD5A1F46F19F00CD2271 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + FE41FD691F46F1E600CD2271 /* PBXTargetDependency */, + ); + name = "AwaitKit Tests"; + productName = "AwaitKit Tests"; + productReference = FE41FD5D1F46F19F00CD2271 /* AwaitKit Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; FEF0141D1E39E12200C4A60B /* AwaitKit */ = { isa = PBXNativeTarget; buildConfigurationList = FEF014261E39E12200C4A60B /* Build configuration list for PBXNativeTarget "AwaitKit" */; @@ -195,39 +208,21 @@ productReference = FEF0141E1E39E12200C4A60B /* AwaitKit.framework */; productType = "com.apple.product-type.framework"; }; - FEF0147A1E39E4CE00C4A60B /* AwaitKit Tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = FEF014831E39E4CE00C4A60B /* Build configuration list for PBXNativeTarget "AwaitKit Tests" */; - buildPhases = ( - FEF014771E39E4CE00C4A60B /* Sources */, - FEF014781E39E4CE00C4A60B /* Frameworks */, - FEF014791E39E4CE00C4A60B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - FEF014821E39E4CE00C4A60B /* PBXTargetDependency */, - ); - name = "AwaitKit Tests"; - productName = "AwaitKit iOS Tests"; - productReference = FEF0147B1E39E4CE00C4A60B /* AwaitKit Tests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ FEF014151E39E12200C4A60B /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0820; + LastSwiftUpdateCheck = 0830; LastUpgradeCheck = 0830; ORGANIZATIONNAME = "Yannick Loriot"; TargetAttributes = { - FEF0141D1E39E12200C4A60B = { - CreatedOnToolsVersion = 8.2.1; + FE41FD5C1F46F19F00CD2271 = { + CreatedOnToolsVersion = 8.3.3; ProvisioningStyle = Automatic; }; - FEF0147A1E39E4CE00C4A60B = { + FEF0141D1E39E12200C4A60B = { CreatedOnToolsVersion = 8.2.1; ProvisioningStyle = Automatic; }; @@ -253,7 +248,7 @@ projectRoot = ""; targets = ( FEF0141D1E39E12200C4A60B /* AwaitKit */, - FEF0147A1E39E4CE00C4A60B /* AwaitKit Tests */, + FE41FD5C1F46F19F00CD2271 /* AwaitKit Tests */, ); }; /* End PBXProject section */ @@ -304,16 +299,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FEF014791E39E4CE00C4A60B /* Resources */ = { - isa = PBXResourcesBuildPhase; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + FE41FD591F46F19F00CD2271 /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + FE41FD661F46F1C300CD2271 /* AwaitKitAwaitTests.swift in Sources */, + FE41FD671F46F1C300CD2271 /* AwaitKitTests.swift in Sources */, + FE41FD651F46F1C300CD2271 /* AwaitKitAsyncTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ FEF014191E39E12200C4A60B /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -325,20 +323,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FEF014771E39E4CE00C4A60B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - FE41FD161F46DB0700CD2271 /* DispatchQueue+Async.swift in Sources */, - FE41FCF51F46D9DD00CD2271 /* AwaitKitAwaitTests.swift in Sources */, - FE41FD171F46DB0700CD2271 /* DispatchQueue+Await.swift in Sources */, - FE41FCF61F46D9DD00CD2271 /* AwaitKitTests.swift in Sources */, - FE41FD151F46DB0700CD2271 /* AwaitKitExtension.swift in Sources */, - FE41FCF41F46D9DD00CD2271 /* AwaitKitAsyncTests.swift in Sources */, - FE41FD141F46DB0700CD2271 /* AwaitKit.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -347,21 +331,41 @@ name = PromiseKit; targetProxy = FE41FD0F1F46DA8E00CD2271 /* PBXContainerItemProxy */; }; - FEF014821E39E4CE00C4A60B /* PBXTargetDependency */ = { + FE41FD691F46F1E600CD2271 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = FEF0141D1E39E12200C4A60B /* AwaitKit */; - targetProxy = FEF014811E39E4CE00C4A60B /* PBXContainerItemProxy */; + targetProxy = FE41FD681F46F1E600CD2271 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + FE41FD631F46F19F00CD2271 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks"; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + FE41FD641F46F19F00CD2271 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks"; + SWIFT_VERSION = 3.0; + }; + name = Release; + }; FEF014241E39E12200C4A60B /* Debug */ = { isa = XCBuildConfiguration; 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_BOOL_CONVERSION = YES; @@ -376,13 +380,13 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3.0.2; DEBUG_INFORMATION_FORMAT = dwarf; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; 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; @@ -397,16 +401,17 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_DYLIB_INSTALL_NAME = "@rpath"; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot; + PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos watchsimulator iphonesimulator watchos iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; @@ -416,8 +421,6 @@ 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_BOOL_CONVERSION = YES; @@ -432,13 +435,13 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3.0.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; 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; @@ -447,15 +450,16 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_DYLIB_INSTALL_NAME = "@rpath"; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot; + PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos watchsimulator iphonesimulator watchos iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; @@ -465,14 +469,11 @@ buildSettings = { CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.AwaitKit; - PRODUCT_NAME = AwaitKit; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; }; @@ -483,69 +484,42 @@ buildSettings = { CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.AwaitKit; - PRODUCT_NAME = AwaitKit; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; }; name = Release; }; - FEF014841E39E4CE00C4A60B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.AwaitKit-iOS-Tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - FEF014851E39E4CE00C4A60B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.AwaitKit-iOS-Tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - FEF014181E39E12200C4A60B /* Build configuration list for PBXProject "AwaitKit" */ = { + FE41FD621F46F19F00CD2271 /* Build configuration list for PBXNativeTarget "AwaitKit Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - FEF014241E39E12200C4A60B /* Debug */, - FEF014251E39E12200C4A60B /* Release */, + FE41FD631F46F19F00CD2271 /* Debug */, + FE41FD641F46F19F00CD2271 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - FEF014261E39E12200C4A60B /* Build configuration list for PBXNativeTarget "AwaitKit" */ = { + FEF014181E39E12200C4A60B /* Build configuration list for PBXProject "AwaitKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - FEF014271E39E12200C4A60B /* Debug */, - FEF014281E39E12200C4A60B /* Release */, + FEF014241E39E12200C4A60B /* Debug */, + FEF014251E39E12200C4A60B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - FEF014831E39E4CE00C4A60B /* Build configuration list for PBXNativeTarget "AwaitKit Tests" */ = { + FEF014261E39E12200C4A60B /* Build configuration list for PBXNativeTarget "AwaitKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - FEF014841E39E4CE00C4A60B /* Debug */, - FEF014851E39E4CE00C4A60B /* Release */, + FEF014271E39E12200C4A60B /* Debug */, + FEF014281E39E12200C4A60B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/AwaitKit.xcodeproj/xcshareddata/xcschemes/AwaitKit.xcscheme b/AwaitKit.xcodeproj/xcshareddata/xcschemes/AwaitKit.xcscheme index 9afc261..9fc607f 100644 --- a/AwaitKit.xcodeproj/xcshareddata/xcschemes/AwaitKit.xcscheme +++ b/AwaitKit.xcodeproj/xcshareddata/xcschemes/AwaitKit.xcscheme @@ -4,7 +4,7 @@ version = "1.3"> + buildImplicitDependencies = "NO"> + shouldUseLaunchSchemeArgsEnv = "YES"> diff --git a/Tests/AwaitKitAsyncTests.swift b/Tests/AwaitKitAsyncTests.swift index b272aeb..c5fab30 100644 --- a/Tests/AwaitKitAsyncTests.swift +++ b/Tests/AwaitKitAsyncTests.swift @@ -24,6 +24,7 @@ * */ +import AwaitKit import PromiseKit import XCTest diff --git a/Tests/AwaitKitAwaitTests.swift b/Tests/AwaitKitAwaitTests.swift index 1364ddd..53ce892 100644 --- a/Tests/AwaitKitAwaitTests.swift +++ b/Tests/AwaitKitAwaitTests.swift @@ -24,6 +24,7 @@ * */ +import AwaitKit import PromiseKit import XCTest diff --git a/Tests/AwaitKitTests.swift b/Tests/AwaitKitTests.swift index 8cd1ce7..f857acb 100644 --- a/Tests/AwaitKitTests.swift +++ b/Tests/AwaitKitTests.swift @@ -24,6 +24,7 @@ * */ +import AwaitKit import PromiseKit import XCTest