From 8c060a5412190ffdbb5c66abf0c44941789810a9 Mon Sep 17 00:00:00 2001 From: kishikawa katsumi Date: Sun, 13 Dec 2015 02:54:34 +0900 Subject: [PATCH 1/9] Extract project-level configuration settings into .xcconfig files. --- APIKit.xcodeproj/project.pbxproj | 90 ++++++-------------------------- Cofigurations/Base.xcconfig | 29 ++++++++++ Cofigurations/Debug.xcconfig | 11 ++++ Cofigurations/Release.xcconfig | 7 +++ 4 files changed, 63 insertions(+), 74 deletions(-) create mode 100644 Cofigurations/Base.xcconfig create mode 100644 Cofigurations/Debug.xcconfig create mode 100644 Cofigurations/Release.xcconfig diff --git a/APIKit.xcodeproj/project.pbxproj b/APIKit.xcodeproj/project.pbxproj index d23427a6..d18e0820 100644 --- a/APIKit.xcodeproj/project.pbxproj +++ b/APIKit.xcodeproj/project.pbxproj @@ -85,6 +85,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 141F120F1C1C96820026D415 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Base.xcconfig; path = Cofigurations/Base.xcconfig; sourceTree = ""; }; + 141F12101C1C96820026D415 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Cofigurations/Debug.xcconfig; sourceTree = ""; }; + 141F12111C1C96820026D415 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Cofigurations/Release.xcconfig; sourceTree = ""; }; 19C16B531B83327A001D77CC /* RequestTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTypeTests.swift; sourceTree = ""; }; 7F0869941A978790001AD3E1 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedSerialization.swift; sourceTree = ""; }; @@ -148,12 +151,23 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 141F120E1C1C96690026D415 /* Configurations */ = { + isa = PBXGroup; + children = ( + 141F120F1C1C96820026D415 /* Base.xcconfig */, + 141F12101C1C96820026D415 /* Debug.xcconfig */, + 141F12111C1C96820026D415 /* Release.xcconfig */, + ); + name = Configurations; + sourceTree = ""; + }; 7F45FCD31A94D02C006863BB = { isa = PBXGroup; children = ( 7F8ECDFD1B6A799E00234E04 /* Demo.playground */, 7F45FCDF1A94D02C006863BB /* APIKit */, 7FEC5A151A96FE2600B1D3C0 /* APIKitTests */, + 141F120E1C1C96690026D415 /* Configurations */, 7F45FCDE1A94D02C006863BB /* Products */, ); sourceTree = ""; @@ -485,87 +499,15 @@ }; 7F45FCF11A94D02C006863BB /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12101C1C96820026D415 /* Debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - 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; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_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; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 7F45FCF21A94D02C006863BB /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12111C1C96820026D415 /* Release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 1; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MTL_ENABLE_DEBUG_INFO = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; diff --git a/Cofigurations/Base.xcconfig b/Cofigurations/Base.xcconfig new file mode 100644 index 00000000..70e33c74 --- /dev/null +++ b/Cofigurations/Base.xcconfig @@ -0,0 +1,29 @@ +ALWAYS_SEARCH_USER_PATHS = NO +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_UNREACHABLE_CODE = YES +CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer +CURRENT_PROJECT_VERSION = 1 +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +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 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 +MACOSX_DEPLOYMENT_TARGET = 10.9 +TARGETED_DEVICE_FAMILY = 1,2 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic diff --git a/Cofigurations/Debug.xcconfig b/Cofigurations/Debug.xcconfig new file mode 100644 index 00000000..6c66f562 --- /dev/null +++ b/Cofigurations/Debug.xcconfig @@ -0,0 +1,11 @@ +#include "Base.xcconfig" + +COPY_PHASE_STRIP = NO +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) +GCC_SYMBOLS_PRIVATE_EXTERN = NO +MTL_ENABLE_DEBUG_INFO = YES +ONLY_ACTIVE_ARCH = YES +SWIFT_OPTIMIZATION_LEVEL = -Onone diff --git a/Cofigurations/Release.xcconfig b/Cofigurations/Release.xcconfig new file mode 100644 index 00000000..37d791d6 --- /dev/null +++ b/Cofigurations/Release.xcconfig @@ -0,0 +1,7 @@ +#include "Base.xcconfig" + +COPY_PHASE_STRIP = YES +ENABLE_NS_ASSERTIONS = NO +MTL_ENABLE_DEBUG_INFO = NO +VALIDATE_PRODUCT = YES +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym From 21c319bcfcf261bbe2c5c3b6a088642403c0ca9d Mon Sep 17 00:00:00 2001 From: kishikawa katsumi Date: Sun, 13 Dec 2015 03:06:59 +0900 Subject: [PATCH 2/9] Extract framework/tests targets configuration settings into .xcconfig files. --- APIKit.xcodeproj/project.pbxproj | 112 +++++------------------------- Cofigurations/APIKit-Mac.xcconfig | 14 ++++ Cofigurations/APIKit-iOS.xcconfig | 12 ++++ Cofigurations/Tests-Mac.xcconfig | 7 ++ Cofigurations/Tests-iOS.xcconfig | 5 ++ 5 files changed, 54 insertions(+), 96 deletions(-) create mode 100644 Cofigurations/APIKit-Mac.xcconfig create mode 100644 Cofigurations/APIKit-iOS.xcconfig create mode 100644 Cofigurations/Tests-Mac.xcconfig create mode 100644 Cofigurations/Tests-iOS.xcconfig diff --git a/APIKit.xcodeproj/project.pbxproj b/APIKit.xcodeproj/project.pbxproj index d18e0820..1592b460 100644 --- a/APIKit.xcodeproj/project.pbxproj +++ b/APIKit.xcodeproj/project.pbxproj @@ -88,6 +88,10 @@ 141F120F1C1C96820026D415 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Base.xcconfig; path = Cofigurations/Base.xcconfig; sourceTree = ""; }; 141F12101C1C96820026D415 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Cofigurations/Debug.xcconfig; sourceTree = ""; }; 141F12111C1C96820026D415 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Cofigurations/Release.xcconfig; sourceTree = ""; }; + 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "APIKit-iOS.xcconfig"; path = "Cofigurations/APIKit-iOS.xcconfig"; sourceTree = ""; }; + 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "APIKit-Mac.xcconfig"; path = "Cofigurations/APIKit-Mac.xcconfig"; sourceTree = ""; }; + 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Tests-iOS.xcconfig"; path = "Cofigurations/Tests-iOS.xcconfig"; sourceTree = ""; }; + 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Tests-Mac.xcconfig"; path = "Cofigurations/Tests-Mac.xcconfig"; sourceTree = ""; }; 19C16B531B83327A001D77CC /* RequestTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTypeTests.swift; sourceTree = ""; }; 7F0869941A978790001AD3E1 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedSerialization.swift; sourceTree = ""; }; @@ -157,6 +161,10 @@ 141F120F1C1C96820026D415 /* Base.xcconfig */, 141F12101C1C96820026D415 /* Debug.xcconfig */, 141F12111C1C96820026D415 /* Release.xcconfig */, + 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */, + 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */, + 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */, + 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */, ); name = Configurations; sourceTree = ""; @@ -468,32 +476,15 @@ /* Begin XCBuildConfiguration section */ 7F08699E1A978790001AD3E1 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = APIKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)Tests"; - SDKROOT = macosx; }; name = Debug; }; 7F08699F1A978790001AD3E1 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - INFOPLIST_FILE = APIKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)Tests"; - SDKROOT = macosx; }; name = Release; }; @@ -513,114 +504,43 @@ }; 7F45FCF41A94D02C006863BB /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; - INFOPLIST_FILE = APIKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 7F45FCF51A94D02C006863BB /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; - INFOPLIST_FILE = APIKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; }; name = Release; }; 7F45FD121A94D04D006863BB /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = APIKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 7F45FD131A94D04D006863BB /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = APIKit/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; }; name = Release; }; 7FEC5A1D1A96FE2600B1D3C0 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = APIKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)Tests"; - SDKROOT = iphoneos; }; name = Debug; }; 7FEC5A1E1A96FE2600B1D3C0 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */; buildSettings = { - INFOPLIST_FILE = APIKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(PROJECT_NAME)Tests"; - SDKROOT = iphoneos; }; name = Release; }; diff --git a/Cofigurations/APIKit-Mac.xcconfig b/Cofigurations/APIKit-Mac.xcconfig new file mode 100644 index 00000000..4562299f --- /dev/null +++ b/Cofigurations/APIKit-Mac.xcconfig @@ -0,0 +1,14 @@ +COMBINE_HIDPI_IMAGES = YES +DEFINES_MODULE = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +FRAMEWORK_VERSION = A +INFOPLIST_FILE = APIKit/Info.plist +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +MACOSX_DEPLOYMENT_TARGET = 10.9 +PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(PROJECT_NAME) +SKIP_INSTALL = YES +SDKROOT = macosx diff --git a/Cofigurations/APIKit-iOS.xcconfig b/Cofigurations/APIKit-iOS.xcconfig new file mode 100644 index 00000000..70a9708c --- /dev/null +++ b/Cofigurations/APIKit-iOS.xcconfig @@ -0,0 +1,12 @@ +DEFINES_MODULE = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +ENABLE_BITCODE = YES +INFOPLIST_FILE = APIKit/Info.plist +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(PROJECT_NAME) +SKIP_INSTALL = YES +SDKROOT = iphoneos \ No newline at end of file diff --git a/Cofigurations/Tests-Mac.xcconfig b/Cofigurations/Tests-Mac.xcconfig new file mode 100644 index 00000000..508dfb82 --- /dev/null +++ b/Cofigurations/Tests-Mac.xcconfig @@ -0,0 +1,7 @@ +COMBINE_HIDPI_IMAGES = YES +INFOPLIST_FILE = APIKitTests/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +MACOSX_DEPLOYMENT_TARGET = 10.9 +PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(PROJECT_NAME)Tests +SDKROOT = macosx diff --git a/Cofigurations/Tests-iOS.xcconfig b/Cofigurations/Tests-iOS.xcconfig new file mode 100644 index 00000000..8f621e7d --- /dev/null +++ b/Cofigurations/Tests-iOS.xcconfig @@ -0,0 +1,5 @@ +INFOPLIST_FILE = APIKitTests/Info.plist +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(PROJECT_NAME)Tests +SDKROOT = iphoneos From e5a6da97bec3c1562085eac455fc892c29077b3b Mon Sep 17 00:00:00 2001 From: kishikawa katsumi Date: Sun, 13 Dec 2015 04:17:23 +0900 Subject: [PATCH 3/9] Add a APIKit framework and Tests targets that support OS X, iOS, watchOS and tvOS. --- APIKit.xcodeproj/project.pbxproj | 200 ++++++++++++++++++ .../xcshareddata/xcschemes/APIKit.xcscheme | 113 ++++++++++ Cofigurations/APIKit.xcconfig | 22 ++ Cofigurations/Base.xcconfig | 10 +- Cofigurations/Tests.xcconfig | 10 + 5 files changed, 351 insertions(+), 4 deletions(-) create mode 100644 APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme create mode 100644 Cofigurations/APIKit.xcconfig create mode 100644 Cofigurations/Tests.xcconfig diff --git a/APIKit.xcodeproj/project.pbxproj b/APIKit.xcodeproj/project.pbxproj index 1592b460..5a9b44b2 100644 --- a/APIKit.xcodeproj/project.pbxproj +++ b/APIKit.xcodeproj/project.pbxproj @@ -7,6 +7,24 @@ objects = { /* Begin PBXBuildFile section */ + 141F12181C1C9ABE0026D415 /* RequestBodyBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBE9DC1A9734880075AFD9 /* RequestBodyBuilder.swift */; }; + 141F12191C1C9ABE0026D415 /* Session.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F45FD171A94D085006863BB /* Session.swift */; }; + 141F121A1C1C9ABE0026D415 /* HTTPMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F68ABDC1AC4414500688D68 /* HTTPMethod.swift */; }; + 141F121B1C1C9ABE0026D415 /* RequestType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F68ABD91AC4412E00688D68 /* RequestType.swift */; }; + 141F121C1C1C9ABE0026D415 /* ResponseBodyParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBE9DF1A9734950075AFD9 /* ResponseBodyParser.swift */; }; + 141F121D1C1C9ABE0026D415 /* APIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F5FA6B41B3C58210090B0AF /* APIError.swift */; }; + 141F121E1C1C9ABE0026D415 /* URLEncodedSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */; }; + 141F12201C1C9ABE0026D415 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; + 141F122C1C1C9AC70026D415 /* APITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F1B190A1AA2CA1300C7AFCF /* APITests.swift */; }; + 141F122D1C1C9AC70026D415 /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; }; + 141F122E1C1C9AC70026D415 /* ResponseBodyParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */; }; + 141F122F1C1C9AC70026D415 /* RequestBodyBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */; }; + 141F12311C1C9AC70026D415 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; + 141F12321C1C9AC70026D415 /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; }; + 141F12331C1C9AC70026D415 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; }; + 141F12361C1C9AC70026D415 /* Result.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 141F12371C1C9AC70026D415 /* OHHTTPStubs.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 141F12381C1C9AC70026D415 /* APIKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 19C16B541B83327A001D77CC /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; }; 19C16B551B83327A001D77CC /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; }; 7F08699A1A978790001AD3E1 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCFE1A94D04D006863BB /* APIKit.framework */; }; @@ -43,6 +61,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 141F122A1C1C9AC70026D415 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7F45FCD41A94D02C006863BB /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7F45FCDC1A94D02C006863BB; + remoteInfo = "APIKit-iOS"; + }; 7F08699B1A978790001AD3E1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7F45FCD41A94D02C006863BB /* Project object */; @@ -60,6 +85,19 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 141F12351C1C9AC70026D415 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 141F12361C1C9AC70026D415 /* Result.framework in Copy Frameworks */, + 141F12371C1C9AC70026D415 /* OHHTTPStubs.framework in Copy Frameworks */, + 141F12381C1C9AC70026D415 /* APIKit.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 7F0869A21A9787D6001AD3E1 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -92,6 +130,10 @@ 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "APIKit-Mac.xcconfig"; path = "Cofigurations/APIKit-Mac.xcconfig"; sourceTree = ""; }; 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Tests-iOS.xcconfig"; path = "Cofigurations/Tests-iOS.xcconfig"; sourceTree = ""; }; 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Tests-Mac.xcconfig"; path = "Cofigurations/Tests-Mac.xcconfig"; sourceTree = ""; }; + 141F12261C1C9ABE0026D415 /* APIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = APIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = APIKit.xcconfig; path = Cofigurations/APIKit.xcconfig; sourceTree = ""; }; + 141F12401C1C9EA30026D415 /* Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Tests.xcconfig; path = Cofigurations/Tests.xcconfig; sourceTree = ""; }; 19C16B531B83327A001D77CC /* RequestTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTypeTests.swift; sourceTree = ""; }; 7F0869941A978790001AD3E1 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedSerialization.swift; sourceTree = ""; }; @@ -116,6 +158,24 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 141F121F1C1C9ABE0026D415 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 141F12201C1C9ABE0026D415 /* Result.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 141F12301C1C9AC70026D415 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 141F12311C1C9AC70026D415 /* Result.framework in Frameworks */, + 141F12321C1C9AC70026D415 /* OHHTTPStubs.framework in Frameworks */, + 141F12331C1C9AC70026D415 /* APIKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7F0869911A978790001AD3E1 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -161,6 +221,8 @@ 141F120F1C1C96820026D415 /* Base.xcconfig */, 141F12101C1C96820026D415 /* Debug.xcconfig */, 141F12111C1C96820026D415 /* Release.xcconfig */, + 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */, + 141F12401C1C9EA30026D415 /* Tests.xcconfig */, 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */, 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */, 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */, @@ -187,6 +249,8 @@ 7F45FCFE1A94D04D006863BB /* APIKit.framework */, 7FEC5A141A96FE2600B1D3C0 /* APIKitTests.xctest */, 7F0869941A978790001AD3E1 /* APIKitTests.xctest */, + 141F12261C1C9ABE0026D415 /* APIKit.framework */, + 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */, ); name = Products; sourceTree = ""; @@ -240,6 +304,13 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 141F12211C1C9ABE0026D415 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7F45FCDA1A94D02C006863BB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -257,6 +328,43 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 141F12161C1C9ABE0026D415 /* APIKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 141F12231C1C9ABE0026D415 /* Build configuration list for PBXNativeTarget "APIKit" */; + buildPhases = ( + 141F12171C1C9ABE0026D415 /* Sources */, + 141F121F1C1C9ABE0026D415 /* Frameworks */, + 141F12211C1C9ABE0026D415 /* Headers */, + 141F12221C1C9ABE0026D415 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = APIKit; + productName = APIKit; + productReference = 141F12261C1C9ABE0026D415 /* APIKit.framework */; + productType = "com.apple.product-type.framework"; + }; + 141F12281C1C9AC70026D415 /* Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 141F12391C1C9AC70026D415 /* Build configuration list for PBXNativeTarget "Tests" */; + buildPhases = ( + 141F122B1C1C9AC70026D415 /* Sources */, + 141F12301C1C9AC70026D415 /* Frameworks */, + 141F12341C1C9AC70026D415 /* Resources */, + 141F12351C1C9AC70026D415 /* Copy Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 141F12291C1C9AC70026D415 /* PBXTargetDependency */, + ); + name = Tests; + productName = APIKitTests; + productReference = 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 7F0869931A978790001AD3E1 /* APIKitTests-Mac */ = { isa = PBXNativeTarget; buildConfigurationList = 7F08699D1A978790001AD3E1 /* Build configuration list for PBXNativeTarget "APIKitTests-Mac" */; @@ -368,8 +476,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( + 141F12161C1C9ABE0026D415 /* APIKit */, 7F45FCDC1A94D02C006863BB /* APIKit-iOS */, 7F45FCFD1A94D04D006863BB /* APIKit-Mac */, + 141F12281C1C9AC70026D415 /* Tests */, 7FEC5A131A96FE2600B1D3C0 /* APIKitTests-iOS */, 7F0869931A978790001AD3E1 /* APIKitTests-Mac */, ); @@ -377,6 +487,20 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 141F12221C1C9ABE0026D415 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 141F12341C1C9AC70026D415 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7F0869921A978790001AD3E1 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -408,6 +532,31 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 141F12171C1C9ABE0026D415 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 141F12181C1C9ABE0026D415 /* RequestBodyBuilder.swift in Sources */, + 141F12191C1C9ABE0026D415 /* Session.swift in Sources */, + 141F121A1C1C9ABE0026D415 /* HTTPMethod.swift in Sources */, + 141F121B1C1C9ABE0026D415 /* RequestType.swift in Sources */, + 141F121C1C1C9ABE0026D415 /* ResponseBodyParser.swift in Sources */, + 141F121D1C1C9ABE0026D415 /* APIError.swift in Sources */, + 141F121E1C1C9ABE0026D415 /* URLEncodedSerialization.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 141F122B1C1C9AC70026D415 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 141F122C1C1C9AC70026D415 /* APITests.swift in Sources */, + 141F122D1C1C9AC70026D415 /* RequestTypeTests.swift in Sources */, + 141F122E1C1C9AC70026D415 /* ResponseBodyParserTests.swift in Sources */, + 141F122F1C1C9AC70026D415 /* RequestBodyBuilderTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 7F0869901A978790001AD3E1 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -461,6 +610,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 141F12291C1C9AC70026D415 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 7F45FCDC1A94D02C006863BB /* APIKit-iOS */; + targetProxy = 141F122A1C1C9AC70026D415 /* PBXContainerItemProxy */; + }; 7F08699C1A978790001AD3E1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 7F45FCFD1A94D04D006863BB /* APIKit-Mac */; @@ -474,6 +628,34 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 141F12241C1C9ABE0026D415 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 141F12251C1C9ABE0026D415 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */; + buildSettings = { + }; + name = Release; + }; + 141F123A1C1C9AC70026D415 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 141F12401C1C9EA30026D415 /* Tests.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 141F123B1C1C9AC70026D415 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 141F12401C1C9EA30026D415 /* Tests.xcconfig */; + buildSettings = { + }; + name = Release; + }; 7F08699E1A978790001AD3E1 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */; @@ -547,6 +729,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 141F12231C1C9ABE0026D415 /* Build configuration list for PBXNativeTarget "APIKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 141F12241C1C9ABE0026D415 /* Debug */, + 141F12251C1C9ABE0026D415 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 141F12391C1C9AC70026D415 /* Build configuration list for PBXNativeTarget "Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 141F123A1C1C9AC70026D415 /* Debug */, + 141F123B1C1C9AC70026D415 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 7F08699D1A978790001AD3E1 /* Build configuration list for PBXNativeTarget "APIKitTests-Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme b/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme new file mode 100644 index 00000000..2235c35a --- /dev/null +++ b/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Cofigurations/APIKit.xcconfig b/Cofigurations/APIKit.xcconfig new file mode 100644 index 00000000..71014a64 --- /dev/null +++ b/Cofigurations/APIKit.xcconfig @@ -0,0 +1,22 @@ +COMBINE_HIDPI_IMAGES = YES +DEFINES_MODULE = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +FRAMEWORK_VERSION = A +INFOPLIST_FILE = APIKit/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(PROJECT_NAME) +SKIP_INSTALL = YES + +SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator appletvos appletvsimulator +TARGETED_DEVICE_FAMILY = 1,2,3,4 + +ENABLE_BITCODE[sdk=iphone*] = YES; +ENABLE_BITCODE[sdk=watch*] = YES; +ENABLE_BITCODE[sdk=appletv*] = YES; + +LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks diff --git a/Cofigurations/Base.xcconfig b/Cofigurations/Base.xcconfig index 70e33c74..6183b902 100644 --- a/Cofigurations/Base.xcconfig +++ b/Cofigurations/Base.xcconfig @@ -12,7 +12,6 @@ CLANG_WARN_ENUM_CONVERSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR CLANG_WARN_UNREACHABLE_CODE = YES -CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer CURRENT_PROJECT_VERSION = 1 ENABLE_STRICT_OBJC_MSGSEND = YES GCC_C_LANGUAGE_STANDARD = gnu99 @@ -22,8 +21,11 @@ GCC_WARN_UNDECLARED_SELECTOR = YES GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE GCC_WARN_UNUSED_FUNCTION = YES GCC_WARN_UNUSED_VARIABLE = YES -IPHONEOS_DEPLOYMENT_TARGET = 8.0 -MACOSX_DEPLOYMENT_TARGET = 10.9 -TARGETED_DEVICE_FAMILY = 1,2 VERSION_INFO_PREFIX = VERSIONING_SYSTEM = apple-generic + +CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer +MACOSX_DEPLOYMENT_TARGET = 10.9 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 +WATCHOS_DEPLOYMENT_TARGET = 2.1 +TVOS_DEPLOYMENT_TARGET = 9.0 diff --git a/Cofigurations/Tests.xcconfig b/Cofigurations/Tests.xcconfig new file mode 100644 index 00000000..7a5391bb --- /dev/null +++ b/Cofigurations/Tests.xcconfig @@ -0,0 +1,10 @@ +COMBINE_HIDPI_IMAGES = YES +INFOPLIST_FILE = APIKitTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(PROJECT_NAME)Tests + +SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator + +LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks From de5b5774731ee17abaff4fde4d35c214cd0a5cb5 Mon Sep 17 00:00:00 2001 From: kishikawa katsumi Date: Sun, 13 Dec 2015 04:20:12 +0900 Subject: [PATCH 4/9] Remove the old framework and tests targets, and fix the CI scripts. --- .travis.yml | 5 +- APIKit.xcodeproj/project.pbxproj | 430 ------------------ .../xcschemes/APIKit-Mac.xcscheme | 100 ---- .../xcschemes/APIKit-iOS.xcscheme | 114 ----- Cofigurations/APIKit-Mac.xcconfig | 14 - Cofigurations/APIKit-iOS.xcconfig | 12 - Cofigurations/Tests-Mac.xcconfig | 7 - Cofigurations/Tests-iOS.xcconfig | 5 - 8 files changed, 3 insertions(+), 684 deletions(-) delete mode 100644 APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-Mac.xcscheme delete mode 100644 APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-iOS.xcscheme delete mode 100644 Cofigurations/APIKit-Mac.xcconfig delete mode 100644 Cofigurations/APIKit-iOS.xcconfig delete mode 100644 Cofigurations/Tests-Mac.xcconfig delete mode 100644 Cofigurations/Tests-iOS.xcconfig diff --git a/.travis.yml b/.travis.yml index d6b69aab..20454e92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,9 @@ script: - pod repo update - pod spec lint APIKit.podspec - set -o pipefail - - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit-iOS -sdk iphonesimulator | xcpretty -c - - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit-Mac | xcpretty -c + - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator -destination 'name=iPhone 6,OS=9.1' | xcpretty -c + - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator -destination 'name=Apple TV 1080p,OS=9.0' | xcpretty -c + - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit | xcpretty -c before_deploy: - ./script/import-certificates diff --git a/APIKit.xcodeproj/project.pbxproj b/APIKit.xcodeproj/project.pbxproj index 5a9b44b2..e9dc00df 100644 --- a/APIKit.xcodeproj/project.pbxproj +++ b/APIKit.xcodeproj/project.pbxproj @@ -21,69 +21,10 @@ 141F122F1C1C9AC70026D415 /* RequestBodyBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */; }; 141F12311C1C9AC70026D415 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; 141F12321C1C9AC70026D415 /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; }; - 141F12331C1C9AC70026D415 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; }; 141F12361C1C9AC70026D415 /* Result.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 141F12371C1C9AC70026D415 /* OHHTTPStubs.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 141F12381C1C9AC70026D415 /* APIKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 19C16B541B83327A001D77CC /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; }; - 19C16B551B83327A001D77CC /* RequestTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C16B531B83327A001D77CC /* RequestTypeTests.swift */; }; - 7F08699A1A978790001AD3E1 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCFE1A94D04D006863BB /* APIKit.framework */; }; - 7F0869A01A9787AF001AD3E1 /* RequestBodyBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */; }; - 7F0869A11A9787AF001AD3E1 /* ResponseBodyParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */; }; - 7F0869A61A978BCA001AD3E1 /* URLEncodedSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */; }; - 7F0869A71A978BCA001AD3E1 /* URLEncodedSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */; }; - 7F0869A81A979088001AD3E1 /* Session.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F45FD171A94D085006863BB /* Session.swift */; }; - 7F1B190B1AA2CA1300C7AFCF /* APITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F1B190A1AA2CA1300C7AFCF /* APITests.swift */; }; - 7F1B190C1AA2CA1300C7AFCF /* APITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F1B190A1AA2CA1300C7AFCF /* APITests.swift */; }; - 7F30A8561A975BD600A8C136 /* RequestBodyBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */; }; - 7F45FD181A94D085006863BB /* Session.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F45FD171A94D085006863BB /* Session.swift */; }; - 7F5FA6B51B3C58210090B0AF /* APIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F5FA6B41B3C58210090B0AF /* APIError.swift */; }; - 7F68ABDA1AC4412E00688D68 /* RequestType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F68ABD91AC4412E00688D68 /* RequestType.swift */; }; - 7F68ABDB1AC4412E00688D68 /* RequestType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F68ABD91AC4412E00688D68 /* RequestType.swift */; }; - 7F68ABDD1AC4414500688D68 /* HTTPMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F68ABDC1AC4414500688D68 /* HTTPMethod.swift */; }; - 7F68ABDE1AC4414500688D68 /* HTTPMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F68ABDC1AC4414500688D68 /* HTTPMethod.swift */; }; - 7FCBE9DD1A9734880075AFD9 /* RequestBodyBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBE9DC1A9734880075AFD9 /* RequestBodyBuilder.swift */; }; - 7FCBE9DE1A9734880075AFD9 /* RequestBodyBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBE9DC1A9734880075AFD9 /* RequestBodyBuilder.swift */; }; - 7FCBE9E01A9734950075AFD9 /* ResponseBodyParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBE9DF1A9734950075AFD9 /* ResponseBodyParser.swift */; }; - 7FCBE9E11A9734950075AFD9 /* ResponseBodyParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCBE9DF1A9734950075AFD9 /* ResponseBodyParser.swift */; }; - 7FEC5A191A96FE2600B1D3C0 /* ResponseBodyParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */; }; - 7FEC5A1A1A96FE2600B1D3C0 /* APIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; }; - 84B5C6BC1B42CD430032068D /* APIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F5FA6B41B3C58210090B0AF /* APIError.swift */; }; - CD5115251B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; - CD5115261B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; - CD5115271B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; - CD5115281B1FFBA900514240 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; }; - CD51152E1B1FFCC700514240 /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; }; - CD51152F1B1FFCC700514240 /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; }; - CD5115311B1FFD8F00514240 /* Result.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD5115241B1FFBA900514240 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - CD5115331B1FFD9500514240 /* OHHTTPStubs.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CD51152D1B1FFCC700514240 /* OHHTTPStubs.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - CD5115341B1FFDA600514240 /* APIKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 141F122A1C1C9AC70026D415 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7F45FCD41A94D02C006863BB /* Project object */; - proxyType = 1; - remoteGlobalIDString = 7F45FCDC1A94D02C006863BB; - remoteInfo = "APIKit-iOS"; - }; - 7F08699B1A978790001AD3E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7F45FCD41A94D02C006863BB /* Project object */; - proxyType = 1; - remoteGlobalIDString = 7F45FCFD1A94D04D006863BB; - remoteInfo = "APIKit-Mac"; - }; - 7FEC5A1B1A96FE2600B1D3C0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7F45FCD41A94D02C006863BB /* Project object */; - proxyType = 1; - remoteGlobalIDString = 7F45FCDC1A94D02C006863BB; - remoteInfo = "APIKit-iOS"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 141F12351C1C9AC70026D415 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -93,29 +34,6 @@ files = ( 141F12361C1C9AC70026D415 /* Result.framework in Copy Frameworks */, 141F12371C1C9AC70026D415 /* OHHTTPStubs.framework in Copy Frameworks */, - 141F12381C1C9AC70026D415 /* APIKit.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 7F0869A21A9787D6001AD3E1 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7FEC5A221A97001500B1D3C0 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - CD5115311B1FFD8F00514240 /* Result.framework in Copy Frameworks */, - CD5115331B1FFD9500514240 /* OHHTTPStubs.framework in Copy Frameworks */, - CD5115341B1FFDA600514240 /* APIKit.framework in Copy Frameworks */, ); name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -126,23 +44,16 @@ 141F120F1C1C96820026D415 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Base.xcconfig; path = Cofigurations/Base.xcconfig; sourceTree = ""; }; 141F12101C1C96820026D415 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Cofigurations/Debug.xcconfig; sourceTree = ""; }; 141F12111C1C96820026D415 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Cofigurations/Release.xcconfig; sourceTree = ""; }; - 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "APIKit-iOS.xcconfig"; path = "Cofigurations/APIKit-iOS.xcconfig"; sourceTree = ""; }; - 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "APIKit-Mac.xcconfig"; path = "Cofigurations/APIKit-Mac.xcconfig"; sourceTree = ""; }; - 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Tests-iOS.xcconfig"; path = "Cofigurations/Tests-iOS.xcconfig"; sourceTree = ""; }; - 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Tests-Mac.xcconfig"; path = "Cofigurations/Tests-Mac.xcconfig"; sourceTree = ""; }; 141F12261C1C9ABE0026D415 /* APIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = APIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = APIKit.xcconfig; path = Cofigurations/APIKit.xcconfig; sourceTree = ""; }; 141F12401C1C9EA30026D415 /* Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Tests.xcconfig; path = Cofigurations/Tests.xcconfig; sourceTree = ""; }; 19C16B531B83327A001D77CC /* RequestTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTypeTests.swift; sourceTree = ""; }; - 7F0869941A978790001AD3E1 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedSerialization.swift; sourceTree = ""; }; 7F1B190A1AA2CA1300C7AFCF /* APITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APITests.swift; sourceTree = ""; }; 7F30A8551A975BD600A8C136 /* RequestBodyBuilderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestBodyBuilderTests.swift; sourceTree = ""; }; - 7F45FCDD1A94D02C006863BB /* APIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = APIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7F45FCE11A94D02C006863BB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7F45FCE21A94D02C006863BB /* APIKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APIKit.h; sourceTree = ""; }; - 7F45FCFE1A94D04D006863BB /* APIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = APIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7F45FD171A94D085006863BB /* Session.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Session.swift; sourceTree = ""; }; 7F5FA6B41B3C58210090B0AF /* APIError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIError.swift; sourceTree = ""; }; 7F68ABD91AC4412E00688D68 /* RequestType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestType.swift; sourceTree = ""; }; @@ -150,7 +61,6 @@ 7F8ECDFD1B6A799E00234E04 /* Demo.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Demo.playground; sourceTree = ""; }; 7FCBE9DC1A9734880075AFD9 /* RequestBodyBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestBodyBuilder.swift; sourceTree = ""; }; 7FCBE9DF1A9734950075AFD9 /* ResponseBodyParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResponseBodyParser.swift; sourceTree = ""; }; - 7FEC5A141A96FE2600B1D3C0 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7FEC5A171A96FE2600B1D3C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7FEC5A181A96FE2600B1D3C0 /* ResponseBodyParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseBodyParserTests.swift; sourceTree = ""; }; CD5115241B1FFBA900514240 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -172,43 +82,6 @@ files = ( 141F12311C1C9AC70026D415 /* Result.framework in Frameworks */, 141F12321C1C9AC70026D415 /* OHHTTPStubs.framework in Frameworks */, - 141F12331C1C9AC70026D415 /* APIKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F0869911A978790001AD3E1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - CD5115281B1FFBA900514240 /* Result.framework in Frameworks */, - CD51152F1B1FFCC700514240 /* OHHTTPStubs.framework in Frameworks */, - 7F08699A1A978790001AD3E1 /* APIKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCD91A94D02C006863BB /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - CD5115251B1FFBA900514240 /* Result.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCFA1A94D04D006863BB /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - CD5115261B1FFBA900514240 /* Result.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7FEC5A111A96FE2600B1D3C0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - CD5115271B1FFBA900514240 /* Result.framework in Frameworks */, - CD51152E1B1FFCC700514240 /* OHHTTPStubs.framework in Frameworks */, - 7FEC5A1A1A96FE2600B1D3C0 /* APIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -223,10 +96,6 @@ 141F12111C1C96820026D415 /* Release.xcconfig */, 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */, 141F12401C1C9EA30026D415 /* Tests.xcconfig */, - 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */, - 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */, - 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */, - 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */, ); name = Configurations; sourceTree = ""; @@ -245,10 +114,6 @@ 7F45FCDE1A94D02C006863BB /* Products */ = { isa = PBXGroup; children = ( - 7F45FCDD1A94D02C006863BB /* APIKit.framework */, - 7F45FCFE1A94D04D006863BB /* APIKit.framework */, - 7FEC5A141A96FE2600B1D3C0 /* APIKitTests.xctest */, - 7F0869941A978790001AD3E1 /* APIKitTests.xctest */, 141F12261C1C9ABE0026D415 /* APIKit.framework */, 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */, ); @@ -311,20 +176,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7F45FCDA1A94D02C006863BB /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCFB1A94D04D006863BB /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -358,87 +209,12 @@ buildRules = ( ); dependencies = ( - 141F12291C1C9AC70026D415 /* PBXTargetDependency */, ); name = Tests; productName = APIKitTests; productReference = 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 7F0869931A978790001AD3E1 /* APIKitTests-Mac */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7F08699D1A978790001AD3E1 /* Build configuration list for PBXNativeTarget "APIKitTests-Mac" */; - buildPhases = ( - 7F0869901A978790001AD3E1 /* Sources */, - 7F0869911A978790001AD3E1 /* Frameworks */, - 7F0869921A978790001AD3E1 /* Resources */, - 7F0869A21A9787D6001AD3E1 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 7F08699C1A978790001AD3E1 /* PBXTargetDependency */, - ); - name = "APIKitTests-Mac"; - productName = APIKitTests; - productReference = 7F0869941A978790001AD3E1 /* APIKitTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 7F45FCDC1A94D02C006863BB /* APIKit-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7F45FCF31A94D02C006863BB /* Build configuration list for PBXNativeTarget "APIKit-iOS" */; - buildPhases = ( - 7F45FCD81A94D02C006863BB /* Sources */, - 7F45FCD91A94D02C006863BB /* Frameworks */, - 7F45FCDA1A94D02C006863BB /* Headers */, - 7F45FCDB1A94D02C006863BB /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "APIKit-iOS"; - productName = APIKit; - productReference = 7F45FCDD1A94D02C006863BB /* APIKit.framework */; - productType = "com.apple.product-type.framework"; - }; - 7F45FCFD1A94D04D006863BB /* APIKit-Mac */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7F45FD111A94D04D006863BB /* Build configuration list for PBXNativeTarget "APIKit-Mac" */; - buildPhases = ( - 7F45FCF91A94D04D006863BB /* Sources */, - 7F45FCFA1A94D04D006863BB /* Frameworks */, - 7F45FCFB1A94D04D006863BB /* Headers */, - 7F45FCFC1A94D04D006863BB /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "APIKit-Mac"; - productName = APIKit; - productReference = 7F45FCFE1A94D04D006863BB /* APIKit.framework */; - productType = "com.apple.product-type.framework"; - }; - 7FEC5A131A96FE2600B1D3C0 /* APIKitTests-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7FEC5A1F1A96FE2600B1D3C0 /* Build configuration list for PBXNativeTarget "APIKitTests-iOS" */; - buildPhases = ( - 7FEC5A101A96FE2600B1D3C0 /* Sources */, - 7FEC5A111A96FE2600B1D3C0 /* Frameworks */, - 7FEC5A121A96FE2600B1D3C0 /* Resources */, - 7FEC5A221A97001500B1D3C0 /* Copy Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 7FEC5A1C1A96FE2600B1D3C0 /* PBXTargetDependency */, - ); - name = "APIKitTests-iOS"; - productName = APIKitTests; - productReference = 7FEC5A141A96FE2600B1D3C0 /* APIKitTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -448,20 +224,6 @@ LastSwiftUpdateCheck = 0700; LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Yosuke Ishikawa"; - TargetAttributes = { - 7F0869931A978790001AD3E1 = { - CreatedOnToolsVersion = 6.1.1; - }; - 7F45FCDC1A94D02C006863BB = { - CreatedOnToolsVersion = 6.1.1; - }; - 7F45FCFD1A94D04D006863BB = { - CreatedOnToolsVersion = 6.1.1; - }; - 7FEC5A131A96FE2600B1D3C0 = { - CreatedOnToolsVersion = 6.1.1; - }; - }; }; buildConfigurationList = 7F45FCD71A94D02C006863BB /* Build configuration list for PBXProject "APIKit" */; compatibilityVersion = "Xcode 3.2"; @@ -477,11 +239,7 @@ projectRoot = ""; targets = ( 141F12161C1C9ABE0026D415 /* APIKit */, - 7F45FCDC1A94D02C006863BB /* APIKit-iOS */, - 7F45FCFD1A94D04D006863BB /* APIKit-Mac */, 141F12281C1C9AC70026D415 /* Tests */, - 7FEC5A131A96FE2600B1D3C0 /* APIKitTests-iOS */, - 7F0869931A978790001AD3E1 /* APIKitTests-Mac */, ); }; /* End PBXProject section */ @@ -501,34 +259,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7F0869921A978790001AD3E1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCDB1A94D02C006863BB /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCFC1A94D04D006863BB /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7FEC5A121A96FE2600B1D3C0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -557,76 +287,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7F0869901A978790001AD3E1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7F1B190C1AA2CA1300C7AFCF /* APITests.swift in Sources */, - 19C16B551B83327A001D77CC /* RequestTypeTests.swift in Sources */, - 7F0869A01A9787AF001AD3E1 /* RequestBodyBuilderTests.swift in Sources */, - 7F0869A11A9787AF001AD3E1 /* ResponseBodyParserTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCD81A94D02C006863BB /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7FCBE9DD1A9734880075AFD9 /* RequestBodyBuilder.swift in Sources */, - 7F45FD181A94D085006863BB /* Session.swift in Sources */, - 7F68ABDD1AC4414500688D68 /* HTTPMethod.swift in Sources */, - 7F68ABDA1AC4412E00688D68 /* RequestType.swift in Sources */, - 7FCBE9E01A9734950075AFD9 /* ResponseBodyParser.swift in Sources */, - 7F5FA6B51B3C58210090B0AF /* APIError.swift in Sources */, - 7F0869A61A978BCA001AD3E1 /* URLEncodedSerialization.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7F45FCF91A94D04D006863BB /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 84B5C6BC1B42CD430032068D /* APIError.swift in Sources */, - 7FCBE9DE1A9734880075AFD9 /* RequestBodyBuilder.swift in Sources */, - 7F0869A81A979088001AD3E1 /* Session.swift in Sources */, - 7F68ABDE1AC4414500688D68 /* HTTPMethod.swift in Sources */, - 7F68ABDB1AC4412E00688D68 /* RequestType.swift in Sources */, - 7FCBE9E11A9734950075AFD9 /* ResponseBodyParser.swift in Sources */, - 7F0869A71A978BCA001AD3E1 /* URLEncodedSerialization.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 7FEC5A101A96FE2600B1D3C0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7F1B190B1AA2CA1300C7AFCF /* APITests.swift in Sources */, - 19C16B541B83327A001D77CC /* RequestTypeTests.swift in Sources */, - 7FEC5A191A96FE2600B1D3C0 /* ResponseBodyParserTests.swift in Sources */, - 7F30A8561A975BD600A8C136 /* RequestBodyBuilderTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 141F12291C1C9AC70026D415 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7F45FCDC1A94D02C006863BB /* APIKit-iOS */; - targetProxy = 141F122A1C1C9AC70026D415 /* PBXContainerItemProxy */; - }; - 7F08699C1A978790001AD3E1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7F45FCFD1A94D04D006863BB /* APIKit-Mac */; - targetProxy = 7F08699B1A978790001AD3E1 /* PBXContainerItemProxy */; - }; - 7FEC5A1C1A96FE2600B1D3C0 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7F45FCDC1A94D02C006863BB /* APIKit-iOS */; - targetProxy = 7FEC5A1B1A96FE2600B1D3C0 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 141F12241C1C9ABE0026D415 /* Debug */ = { isa = XCBuildConfiguration; @@ -656,20 +318,6 @@ }; name = Release; }; - 7F08699E1A978790001AD3E1 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 7F08699F1A978790001AD3E1 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12151C1C98B80026D415 /* Tests-Mac.xcconfig */; - buildSettings = { - }; - name = Release; - }; 7F45FCF11A94D02C006863BB /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 141F12101C1C96820026D415 /* Debug.xcconfig */; @@ -684,48 +332,6 @@ }; name = Release; }; - 7F45FCF41A94D02C006863BB /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 7F45FCF51A94D02C006863BB /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12121C1C98B80026D415 /* APIKit-iOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 7F45FD121A94D04D006863BB /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 7F45FD131A94D04D006863BB /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12131C1C98B80026D415 /* APIKit-Mac.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 7FEC5A1D1A96FE2600B1D3C0 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 7FEC5A1E1A96FE2600B1D3C0 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 141F12141C1C98B80026D415 /* Tests-iOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -747,15 +353,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7F08699D1A978790001AD3E1 /* Build configuration list for PBXNativeTarget "APIKitTests-Mac" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7F08699E1A978790001AD3E1 /* Debug */, - 7F08699F1A978790001AD3E1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 7F45FCD71A94D02C006863BB /* Build configuration list for PBXProject "APIKit" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -765,33 +362,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7F45FCF31A94D02C006863BB /* Build configuration list for PBXNativeTarget "APIKit-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7F45FCF41A94D02C006863BB /* Debug */, - 7F45FCF51A94D02C006863BB /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7F45FD111A94D04D006863BB /* Build configuration list for PBXNativeTarget "APIKit-Mac" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7F45FD121A94D04D006863BB /* Debug */, - 7F45FD131A94D04D006863BB /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7FEC5A1F1A96FE2600B1D3C0 /* Build configuration list for PBXNativeTarget "APIKitTests-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7FEC5A1D1A96FE2600B1D3C0 /* Debug */, - 7FEC5A1E1A96FE2600B1D3C0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 7F45FCD41A94D02C006863BB /* Project object */; diff --git a/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-Mac.xcscheme b/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-Mac.xcscheme deleted file mode 100644 index 8c1e05c6..00000000 --- a/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-Mac.xcscheme +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-iOS.xcscheme b/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-iOS.xcscheme deleted file mode 100644 index 82074b9d..00000000 --- a/APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-iOS.xcscheme +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cofigurations/APIKit-Mac.xcconfig b/Cofigurations/APIKit-Mac.xcconfig deleted file mode 100644 index 4562299f..00000000 --- a/Cofigurations/APIKit-Mac.xcconfig +++ /dev/null @@ -1,14 +0,0 @@ -COMBINE_HIDPI_IMAGES = YES -DEFINES_MODULE = YES -DYLIB_COMPATIBILITY_VERSION = 1 -DYLIB_CURRENT_VERSION = 1 -DYLIB_INSTALL_NAME_BASE = @rpath -FRAMEWORK_VERSION = A -INFOPLIST_FILE = APIKit/Info.plist -INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks -MACOSX_DEPLOYMENT_TARGET = 10.9 -PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) -PRODUCT_NAME = $(PROJECT_NAME) -SKIP_INSTALL = YES -SDKROOT = macosx diff --git a/Cofigurations/APIKit-iOS.xcconfig b/Cofigurations/APIKit-iOS.xcconfig deleted file mode 100644 index 70a9708c..00000000 --- a/Cofigurations/APIKit-iOS.xcconfig +++ /dev/null @@ -1,12 +0,0 @@ -DEFINES_MODULE = YES -DYLIB_COMPATIBILITY_VERSION = 1 -DYLIB_CURRENT_VERSION = 1 -DYLIB_INSTALL_NAME_BASE = @rpath -ENABLE_BITCODE = YES -INFOPLIST_FILE = APIKit/Info.plist -INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) -PRODUCT_NAME = $(PROJECT_NAME) -SKIP_INSTALL = YES -SDKROOT = iphoneos \ No newline at end of file diff --git a/Cofigurations/Tests-Mac.xcconfig b/Cofigurations/Tests-Mac.xcconfig deleted file mode 100644 index 508dfb82..00000000 --- a/Cofigurations/Tests-Mac.xcconfig +++ /dev/null @@ -1,7 +0,0 @@ -COMBINE_HIDPI_IMAGES = YES -INFOPLIST_FILE = APIKitTests/Info.plist -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks -MACOSX_DEPLOYMENT_TARGET = 10.9 -PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) -PRODUCT_NAME = $(PROJECT_NAME)Tests -SDKROOT = macosx diff --git a/Cofigurations/Tests-iOS.xcconfig b/Cofigurations/Tests-iOS.xcconfig deleted file mode 100644 index 8f621e7d..00000000 --- a/Cofigurations/Tests-iOS.xcconfig +++ /dev/null @@ -1,5 +0,0 @@ -INFOPLIST_FILE = APIKitTests/Info.plist -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks -PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier) -PRODUCT_NAME = $(PROJECT_NAME)Tests -SDKROOT = iphoneos From c843872eadad84b2b6ec9db97ae468bcc98a22de Mon Sep 17 00:00:00 2001 From: kishikawa katsumi Date: Sun, 13 Dec 2015 04:43:12 +0900 Subject: [PATCH 5/9] Add watchOS and tvOS support to the podspec --- APIKit.podspec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/APIKit.podspec b/APIKit.podspec index 6845befa..40e224f0 100644 --- a/APIKit.podspec +++ b/APIKit.podspec @@ -10,6 +10,12 @@ Pod::Spec.new do |s| s.ios.deployment_target = "8.0" s.osx.deployment_target = "10.9" + if s.respond_to?(:watchos) + s.watchos.deployment_target = "2.1" + end + if s.respond_to?(:tvos) + s.tvos.deployment_target = "9.0" + end s.source_files = "APIKit/*.swift" s.source = { From cc8cf7ffa8c736aaeaa07158ab427b010120a769 Mon Sep 17 00:00:00 2001 From: Yosuke Ishikawa Date: Sun, 13 Dec 2015 18:00:40 +0900 Subject: [PATCH 6/9] Updated dependencies --- Cartfile | 2 +- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Result | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index e523d1a0..04b92292 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "antitypical/Result" ~> 1.0.0 +github "antitypical/Result" ~> 1.0.1 diff --git a/Cartfile.private b/Cartfile.private index 531f2394..95efad6b 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1 +1 @@ -github "AliSoftware/OHHTTPStubs" ~> 4.3.0 +github "AliSoftware/OHHTTPStubs" ~> 4.6.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 77c8f39c..613df587 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "AliSoftware/OHHTTPStubs" "4.6.0" -github "antitypical/Result" "1.0.0" +github "antitypical/Result" "1.0.1" diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 3bded1d8..9f2c108a 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 3bded1d88bebba55863dbabd1d9519ff556ea5f5 +Subproject commit 9f2c108adeb7427782d69381e2414f7175b373cc From 9b2dc497d0ce085217ad61402d1416ffc8c569ab Mon Sep 17 00:00:00 2001 From: Yosuke Ishikawa Date: Sun, 13 Dec 2015 18:04:25 +0900 Subject: [PATCH 7/9] Fix typo in configuration directory name --- APIKit.xcodeproj/project.pbxproj | 10 +++++----- {Cofigurations => Configurations}/APIKit.xcconfig | 0 {Cofigurations => Configurations}/Base.xcconfig | 0 {Cofigurations => Configurations}/Debug.xcconfig | 0 {Cofigurations => Configurations}/Release.xcconfig | 0 {Cofigurations => Configurations}/Tests.xcconfig | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename {Cofigurations => Configurations}/APIKit.xcconfig (100%) rename {Cofigurations => Configurations}/Base.xcconfig (100%) rename {Cofigurations => Configurations}/Debug.xcconfig (100%) rename {Cofigurations => Configurations}/Release.xcconfig (100%) rename {Cofigurations => Configurations}/Tests.xcconfig (100%) diff --git a/APIKit.xcodeproj/project.pbxproj b/APIKit.xcodeproj/project.pbxproj index e9dc00df..86475346 100644 --- a/APIKit.xcodeproj/project.pbxproj +++ b/APIKit.xcodeproj/project.pbxproj @@ -41,13 +41,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 141F120F1C1C96820026D415 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Base.xcconfig; path = Cofigurations/Base.xcconfig; sourceTree = ""; }; - 141F12101C1C96820026D415 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Cofigurations/Debug.xcconfig; sourceTree = ""; }; - 141F12111C1C96820026D415 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Cofigurations/Release.xcconfig; sourceTree = ""; }; + 141F120F1C1C96820026D415 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Base.xcconfig; path = Configurations/Base.xcconfig; sourceTree = ""; }; + 141F12101C1C96820026D415 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Configurations/Debug.xcconfig; sourceTree = ""; }; + 141F12111C1C96820026D415 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Configurations/Release.xcconfig; sourceTree = ""; }; 141F12261C1C9ABE0026D415 /* APIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = APIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 141F123C1C1C9AC70026D415 /* APIKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = APIKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = APIKit.xcconfig; path = Cofigurations/APIKit.xcconfig; sourceTree = ""; }; - 141F12401C1C9EA30026D415 /* Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Tests.xcconfig; path = Cofigurations/Tests.xcconfig; sourceTree = ""; }; + 141F123F1C1C9EA30026D415 /* APIKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = APIKit.xcconfig; path = Configurations/APIKit.xcconfig; sourceTree = ""; }; + 141F12401C1C9EA30026D415 /* Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Tests.xcconfig; path = Configurations/Tests.xcconfig; sourceTree = ""; }; 19C16B531B83327A001D77CC /* RequestTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestTypeTests.swift; sourceTree = ""; }; 7F0869A51A978BCA001AD3E1 /* URLEncodedSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedSerialization.swift; sourceTree = ""; }; 7F1B190A1AA2CA1300C7AFCF /* APITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APITests.swift; sourceTree = ""; }; diff --git a/Cofigurations/APIKit.xcconfig b/Configurations/APIKit.xcconfig similarity index 100% rename from Cofigurations/APIKit.xcconfig rename to Configurations/APIKit.xcconfig diff --git a/Cofigurations/Base.xcconfig b/Configurations/Base.xcconfig similarity index 100% rename from Cofigurations/Base.xcconfig rename to Configurations/Base.xcconfig diff --git a/Cofigurations/Debug.xcconfig b/Configurations/Debug.xcconfig similarity index 100% rename from Cofigurations/Debug.xcconfig rename to Configurations/Debug.xcconfig diff --git a/Cofigurations/Release.xcconfig b/Configurations/Release.xcconfig similarity index 100% rename from Cofigurations/Release.xcconfig rename to Configurations/Release.xcconfig diff --git a/Cofigurations/Tests.xcconfig b/Configurations/Tests.xcconfig similarity index 100% rename from Cofigurations/Tests.xcconfig rename to Configurations/Tests.xcconfig From e700f872bd5464a78defac1019663d6983e1b92e Mon Sep 17 00:00:00 2001 From: Yosuke Ishikawa Date: Sun, 13 Dec 2015 18:05:14 +0900 Subject: [PATCH 8/9] Set deployment target 2.0 --- Configurations/Base.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations/Base.xcconfig b/Configurations/Base.xcconfig index 6183b902..649a371d 100644 --- a/Configurations/Base.xcconfig +++ b/Configurations/Base.xcconfig @@ -27,5 +27,5 @@ VERSIONING_SYSTEM = apple-generic CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer MACOSX_DEPLOYMENT_TARGET = 10.9 IPHONEOS_DEPLOYMENT_TARGET = 8.0 -WATCHOS_DEPLOYMENT_TARGET = 2.1 +WATCHOS_DEPLOYMENT_TARGET = 2.0 TVOS_DEPLOYMENT_TARGET = 9.0 From e68f903bb705d7ec730621cb2e627c93f4755974 Mon Sep 17 00:00:00 2001 From: Yosuke Ishikawa Date: Sun, 13 Dec 2015 18:26:12 +0900 Subject: [PATCH 9/9] Update README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 966b704e..a602a9a9 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,10 @@ Session.sendRequest(request) { result in ## Requirements - Swift 2.1 -- iOS 8.0 or later - Mac OS 10.9 or later +- iOS 8.0 or later +- watchOS 2.0 or later +- tvOS 9.0 or later ## Installation