From b27609029aa11108d7f1a9e05432e5f849f445a8 Mon Sep 17 00:00:00 2001 From: Aleksandr Dodatko Date: Fri, 20 Feb 2015 11:50:31 +0200 Subject: [PATCH 1/4] [carthage] Added a static lib and framework target --- Example/Raven-Info.plist | 2 +- Raven.xcodeproj/project.pbxproj | 598 +++++++++++++++++++++++++++++++- Raven/Info.plist | 26 ++ Raven/Raven.h | 21 ++ RavenClientTests/Info.plist | 24 ++ RavenTests/Info.plist | 24 ++ RavenTests/RavenTests.m | 40 +++ 7 files changed, 731 insertions(+), 4 deletions(-) create mode 100644 Raven/Info.plist create mode 100644 Raven/Raven.h create mode 100644 RavenClientTests/Info.plist create mode 100644 RavenTests/Info.plist create mode 100644 RavenTests/RavenTests.m diff --git a/Example/Raven-Info.plist b/Example/Raven-Info.plist index 690b2e2..caefff5 100644 --- a/Example/Raven-Info.plist +++ b/Example/Raven-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - nl.mixedCase.${PRODUCT_NAME:rfc1034identifier} + nl.mixedCase.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Raven.xcodeproj/project.pbxproj b/Raven.xcodeproj/project.pbxproj index bad1a4f..eb962a8 100644 --- a/Raven.xcodeproj/project.pbxproj +++ b/Raven.xcodeproj/project.pbxproj @@ -22,12 +22,51 @@ 0A46FEC6156FA72300D97F26 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0A46FEC4156FA72300D97F26 /* InfoPlist.strings */; }; 0A46FEC9156FA72300D97F26 /* RavenClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FEC8156FA72300D97F26 /* RavenClientTest.m */; }; 0A46FEDA156FA8D900D97F26 /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; + 7EE5B0201A9739A90086A3AE /* libRavenClient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EE5B0151A9739A90086A3AE /* libRavenClient.a */; }; + 7EE5B02C1A9739F40086A3AE /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; + 7EE5B02D1A9739F40086A3AE /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; + 7EE5B0381A973A300086A3AE /* Raven.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE5B0371A973A300086A3AE /* Raven.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7EE5B03E1A973A300086A3AE /* Raven.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EE5B0331A973A300086A3AE /* Raven.framework */; }; + 7EE5B0451A973A300086A3AE /* RavenTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE5B0441A973A300086A3AE /* RavenTests.m */; }; + 7EE5B04C1A973A3E0086A3AE /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; + 7EE5B04D1A973A3E0086A3AE /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; + 7EE5B04E1A973A9F0086A3AE /* RavenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A46FED8156FA8D900D97F26 /* RavenClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7EE5B04F1A973A9F0086A3AE /* RavenConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BAEC13C168E6FC100408CDB /* RavenConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8BAEC13E168E6FC100408CDB /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; 8BAEC142168E725100408CDB /* RavenConfigTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC141168E725100408CDB /* RavenConfigTest.m */; }; 8BAEC154168E747900408CDB /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; 8BAEC156168E748700408CDB /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 7EE5B0211A9739A90086A3AE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0A46FE90156FA72300D97F26 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7EE5B0141A9739A90086A3AE; + remoteInfo = RavenClient; + }; + 7EE5B03F1A973A300086A3AE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0A46FE90156FA72300D97F26 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7EE5B0321A973A300086A3AE; + remoteInfo = Raven; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 7EE5B0131A9739A90086A3AE /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0A1479A216C2958F00D3B69D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 0A33DE37156FA9D500AB3299 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = ""; }; @@ -54,6 +93,15 @@ 0A46FEC8156FA72300D97F26 /* RavenClientTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RavenClientTest.m; sourceTree = ""; }; 0A46FED8156FA8D900D97F26 /* RavenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RavenClient.h; sourceTree = ""; }; 0A46FED9156FA8D900D97F26 /* RavenClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RavenClient.m; sourceTree = ""; }; + 7EE5B0151A9739A90086A3AE /* libRavenClient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRavenClient.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 7EE5B01F1A9739A90086A3AE /* RavenClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RavenClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 7EE5B0251A9739A90086A3AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7EE5B0331A973A300086A3AE /* Raven.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Raven.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7EE5B0361A973A300086A3AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7EE5B0371A973A300086A3AE /* Raven.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Raven.h; sourceTree = ""; }; + 7EE5B03D1A973A300086A3AE /* RavenTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RavenTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 7EE5B0431A973A300086A3AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7EE5B0441A973A300086A3AE /* RavenTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RavenTests.m; sourceTree = ""; }; 8BAEC123168E6D0200408CDB /* RavenClient_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RavenClient_Private.h; sourceTree = ""; }; 8BAEC13C168E6FC100408CDB /* RavenConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RavenConfig.h; sourceTree = ""; }; 8BAEC13D168E6FC100408CDB /* RavenConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RavenConfig.m; sourceTree = ""; }; @@ -82,6 +130,36 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EE5B0121A9739A90086A3AE /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B01C1A9739A90086A3AE /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EE5B0201A9739A90086A3AE /* libRavenClient.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B02F1A973A300086A3AE /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B03A1A973A300086A3AE /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EE5B03E1A973A300086A3AE /* Raven.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -91,6 +169,9 @@ 0A46FED2156FA74700D97F26 /* Raven */, 0A46FEA3156FA72300D97F26 /* Example */, 0A46FEC1156FA72300D97F26 /* RavenTests */, + 7EE5B0231A9739A90086A3AE /* RavenClientTests */, + 7EE5B0341A973A300086A3AE /* Raven */, + 7EE5B0411A973A300086A3AE /* RavenTests */, 0A46FE9C156FA72300D97F26 /* Frameworks */, 0A46FE9A156FA72300D97F26 /* Products */, 0A33DE39156FAA0B00AB3299 /* AUTHORS */, @@ -104,6 +185,10 @@ children = ( 0A46FE99156FA72300D97F26 /* RavenExample.app */, 0A46FEBA156FA72300D97F26 /* RavenTests.octest */, + 7EE5B0151A9739A90086A3AE /* libRavenClient.a */, + 7EE5B01F1A9739A90086A3AE /* RavenClientTests.xctest */, + 7EE5B0331A973A300086A3AE /* Raven.framework */, + 7EE5B03D1A973A300086A3AE /* RavenTests.xctest */, ); name = Products; sourceTree = ""; @@ -177,8 +262,71 @@ path = Raven; sourceTree = ""; }; + 7EE5B0231A9739A90086A3AE /* RavenClientTests */ = { + isa = PBXGroup; + children = ( + 7EE5B0241A9739A90086A3AE /* Supporting Files */, + ); + path = RavenClientTests; + sourceTree = ""; + }; + 7EE5B0241A9739A90086A3AE /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 7EE5B0251A9739A90086A3AE /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 7EE5B0341A973A300086A3AE /* Raven */ = { + isa = PBXGroup; + children = ( + 7EE5B0371A973A300086A3AE /* Raven.h */, + 7EE5B0351A973A300086A3AE /* Supporting Files */, + ); + path = Raven; + sourceTree = ""; + }; + 7EE5B0351A973A300086A3AE /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 7EE5B0361A973A300086A3AE /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 7EE5B0411A973A300086A3AE /* RavenTests */ = { + isa = PBXGroup; + children = ( + 7EE5B0441A973A300086A3AE /* RavenTests.m */, + 7EE5B0421A973A300086A3AE /* Supporting Files */, + ); + path = RavenTests; + sourceTree = ""; + }; + 7EE5B0421A973A300086A3AE /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 7EE5B0431A973A300086A3AE /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 7EE5B0301A973A300086A3AE /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EE5B04F1A973A9F0086A3AE /* RavenConfig.h in Headers */, + 7EE5B04E1A973A9F0086A3AE /* RavenClient.h in Headers */, + 7EE5B0381A973A300086A3AE /* Raven.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 0A46FE98156FA72300D97F26 /* RavenExample */ = { isa = PBXNativeTarget; @@ -213,7 +361,78 @@ name = RavenTests; productName = RavenTests; productReference = 0A46FEBA156FA72300D97F26 /* RavenTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; + }; + 7EE5B0141A9739A90086A3AE /* RavenClient */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7EE5B0261A9739A90086A3AE /* Build configuration list for PBXNativeTarget "RavenClient" */; + buildPhases = ( + 7EE5B0111A9739A90086A3AE /* Sources */, + 7EE5B0121A9739A90086A3AE /* Frameworks */, + 7EE5B0131A9739A90086A3AE /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = RavenClient; + productName = RavenClient; + productReference = 7EE5B0151A9739A90086A3AE /* libRavenClient.a */; + productType = "com.apple.product-type.library.static"; + }; + 7EE5B01E1A9739A90086A3AE /* RavenClientTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7EE5B0291A9739A90086A3AE /* Build configuration list for PBXNativeTarget "RavenClientTests" */; + buildPhases = ( + 7EE5B01B1A9739A90086A3AE /* Sources */, + 7EE5B01C1A9739A90086A3AE /* Frameworks */, + 7EE5B01D1A9739A90086A3AE /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 7EE5B0221A9739A90086A3AE /* PBXTargetDependency */, + ); + name = RavenClientTests; + productName = RavenClientTests; + productReference = 7EE5B01F1A9739A90086A3AE /* RavenClientTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 7EE5B0321A973A300086A3AE /* Raven */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven" */; + buildPhases = ( + 7EE5B02E1A973A300086A3AE /* Sources */, + 7EE5B02F1A973A300086A3AE /* Frameworks */, + 7EE5B0301A973A300086A3AE /* Headers */, + 7EE5B0311A973A300086A3AE /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Raven; + productName = Raven; + productReference = 7EE5B0331A973A300086A3AE /* Raven.framework */; + productType = "com.apple.product-type.framework"; + }; + 7EE5B03C1A973A300086A3AE /* RavenTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7EE5B0491A973A300086A3AE /* Build configuration list for PBXNativeTarget "RavenTests" */; + buildPhases = ( + 7EE5B0391A973A300086A3AE /* Sources */, + 7EE5B03A1A973A300086A3AE /* Frameworks */, + 7EE5B03B1A973A300086A3AE /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 7EE5B0401A973A300086A3AE /* PBXTargetDependency */, + ); + name = RavenTests; + productName = RavenTests; + productReference = 7EE5B03D1A973A300086A3AE /* RavenTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -223,6 +442,20 @@ attributes = { LastUpgradeCheck = 0460; ORGANIZATIONNAME = Gangverk; + TargetAttributes = { + 7EE5B0141A9739A90086A3AE = { + CreatedOnToolsVersion = 6.1.1; + }; + 7EE5B01E1A9739A90086A3AE = { + CreatedOnToolsVersion = 6.1.1; + }; + 7EE5B0321A973A300086A3AE = { + CreatedOnToolsVersion = 6.1.1; + }; + 7EE5B03C1A973A300086A3AE = { + CreatedOnToolsVersion = 6.1.1; + }; + }; }; buildConfigurationList = 0A46FE93156FA72300D97F26 /* Build configuration list for PBXProject "Raven" */; compatibilityVersion = "Xcode 3.2"; @@ -238,6 +471,10 @@ targets = ( 0A46FE98156FA72300D97F26 /* RavenExample */, 0A46FEB9156FA72300D97F26 /* RavenTests */, + 7EE5B0141A9739A90086A3AE /* RavenClient */, + 7EE5B01E1A9739A90086A3AE /* RavenClientTests */, + 7EE5B0321A973A300086A3AE /* Raven */, + 7EE5B03C1A973A300086A3AE /* RavenTests */, ); }; /* End PBXProject section */ @@ -261,6 +498,27 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EE5B01D1A9739A90086A3AE /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B0311A973A300086A3AE /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B03B1A973A300086A3AE /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -303,8 +561,54 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EE5B0111A9739A90086A3AE /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EE5B02C1A9739F40086A3AE /* RavenClient.m in Sources */, + 7EE5B02D1A9739F40086A3AE /* RavenConfig.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B01B1A9739A90086A3AE /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B02E1A973A300086A3AE /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EE5B04C1A973A3E0086A3AE /* RavenClient.m in Sources */, + 7EE5B04D1A973A3E0086A3AE /* RavenConfig.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7EE5B0391A973A300086A3AE /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EE5B0451A973A300086A3AE /* RavenTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 7EE5B0221A9739A90086A3AE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 7EE5B0141A9739A90086A3AE /* RavenClient */; + targetProxy = 7EE5B0211A9739A90086A3AE /* PBXContainerItemProxy */; + }; + 7EE5B0401A973A300086A3AE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 7EE5B0321A973A300086A3AE /* Raven */; + targetProxy = 7EE5B03F1A973A300086A3AE /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 0A46FEA6156FA72300D97F26 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -337,7 +641,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; @@ -367,7 +670,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; @@ -454,6 +756,264 @@ }; name = Release; }; + 7EE5B0271A9739A90086A3AE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 7EE5B0281A9739A90086A3AE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 7EE5B02A1A9739A90086A3AE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = RavenClientTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 7EE5B02B1A9739A90086A3AE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = RavenClientTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 7EE5B0471A973A300086A3AE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = Raven/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 7EE5B0481A973A300086A3AE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = Raven/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 7EE5B04A1A973A300086A3AE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = RavenTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 7EE5B04B1A973A300086A3AE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = RavenTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -484,6 +1044,38 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 7EE5B0261A9739A90086A3AE /* Build configuration list for PBXNativeTarget "RavenClient" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7EE5B0271A9739A90086A3AE /* Debug */, + 7EE5B0281A9739A90086A3AE /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 7EE5B0291A9739A90086A3AE /* Build configuration list for PBXNativeTarget "RavenClientTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7EE5B02A1A9739A90086A3AE /* Debug */, + 7EE5B02B1A9739A90086A3AE /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7EE5B0471A973A300086A3AE /* Debug */, + 7EE5B0481A973A300086A3AE /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 7EE5B0491A973A300086A3AE /* Build configuration list for PBXNativeTarget "RavenTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7EE5B04A1A973A300086A3AE /* Debug */, + 7EE5B04B1A973A300086A3AE /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 0A46FE90156FA72300D97F26 /* Project object */; diff --git a/Raven/Info.plist b/Raven/Info.plist new file mode 100644 index 0000000..70ce36e --- /dev/null +++ b/Raven/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + nl.mixedCase.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Raven/Raven.h b/Raven/Raven.h new file mode 100644 index 0000000..14f905c --- /dev/null +++ b/Raven/Raven.h @@ -0,0 +1,21 @@ +// +// Raven.h +// Raven +// +// Created by Oleksandr Dodatko on 2/20/15. +// Copyright (c) 2015 Gangverk. All rights reserved. +// + +#import + +//! Project version number for Raven. +FOUNDATION_EXPORT double RavenVersionNumber; + +//! Project version string for Raven. +FOUNDATION_EXPORT const unsigned char RavenVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + +#import +#import diff --git a/RavenClientTests/Info.plist b/RavenClientTests/Info.plist new file mode 100644 index 0000000..5f2b8d6 --- /dev/null +++ b/RavenClientTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + nl.mixedCase.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/RavenTests/Info.plist b/RavenTests/Info.plist new file mode 100644 index 0000000..5f2b8d6 --- /dev/null +++ b/RavenTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + nl.mixedCase.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/RavenTests/RavenTests.m b/RavenTests/RavenTests.m new file mode 100644 index 0000000..722de7d --- /dev/null +++ b/RavenTests/RavenTests.m @@ -0,0 +1,40 @@ +// +// RavenTests.m +// RavenTests +// +// Created by Oleksandr Dodatko on 2/20/15. +// Copyright (c) 2015 Gangverk. All rights reserved. +// + +#import +#import + +@interface RavenTests : XCTestCase + +@end + +@implementation RavenTests + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // This is an example of a functional test case. + XCTAssert(YES, @"Pass"); +} + +- (void)testPerformanceExample { + // This is an example of a performance test case. + [self measureBlock:^{ + // Put the code you want to measure the time of here. + }]; +} + +@end From e16cedcb5a1a139f43cd0c69a6a0f7ff3ad57a2c Mon Sep 17 00:00:00 2001 From: Aleksandr Dodatko Date: Fri, 20 Feb 2015 11:57:37 +0200 Subject: [PATCH 2/4] [carthage] Added a shared scheme for a framework --- .../xcschemes/Raven-Carthage-iOS.xcscheme | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme diff --git a/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme b/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme new file mode 100644 index 0000000..b097dba --- /dev/null +++ b/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 162645a975e38d267aa148237bce57ec3ef8d99d Mon Sep 17 00:00:00 2001 From: Alexander Dodatko Date: Sat, 14 Mar 2015 15:05:51 +0200 Subject: [PATCH 3/4] Switched to XCTest --- Raven.xcodeproj/project.pbxproj | 181 ++++++++------------------------ RavenTests/RavenClientTest.h | 4 +- RavenTests/RavenClientTest.m | 136 ++++++++++++------------ RavenTests/RavenConfigTest.h | 4 +- RavenTests/RavenConfigTest.m | 30 +++--- 5 files changed, 132 insertions(+), 223 deletions(-) diff --git a/Raven.xcodeproj/project.pbxproj b/Raven.xcodeproj/project.pbxproj index eb962a8..c01d680 100644 --- a/Raven.xcodeproj/project.pbxproj +++ b/Raven.xcodeproj/project.pbxproj @@ -16,22 +16,24 @@ 0A46FEAE156FA72300D97F26 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FEAD156FA72300D97F26 /* AppDelegate.m */; }; 0A46FEB1156FA72300D97F26 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0A46FEAF156FA72300D97F26 /* MainStoryboard.storyboard */; }; 0A46FEB4156FA72300D97F26 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FEB3156FA72300D97F26 /* ViewController.m */; }; - 0A46FEBC156FA72300D97F26 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FEBB156FA72300D97F26 /* SenTestingKit.framework */; }; 0A46FEBD156FA72300D97F26 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FE9D156FA72300D97F26 /* UIKit.framework */; }; 0A46FEBE156FA72300D97F26 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FE9F156FA72300D97F26 /* Foundation.framework */; }; 0A46FEC6156FA72300D97F26 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0A46FEC4156FA72300D97F26 /* InfoPlist.strings */; }; 0A46FEC9156FA72300D97F26 /* RavenClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FEC8156FA72300D97F26 /* RavenClientTest.m */; }; 0A46FEDA156FA8D900D97F26 /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; + 7E7BFEFD1AB464BC00FEB601 /* RavenClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FEC8156FA72300D97F26 /* RavenClientTest.m */; }; + 7E7BFEFE1AB464C000FEB601 /* RavenConfigTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC141168E725100408CDB /* RavenConfigTest.m */; }; + 7E7BFF011AB464E500FEB601 /* Raven.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EE5B0331A973A300086A3AE /* Raven.framework */; }; 7EE5B0201A9739A90086A3AE /* libRavenClient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EE5B0151A9739A90086A3AE /* libRavenClient.a */; }; 7EE5B02C1A9739F40086A3AE /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; 7EE5B02D1A9739F40086A3AE /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; 7EE5B0381A973A300086A3AE /* Raven.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE5B0371A973A300086A3AE /* Raven.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7EE5B03E1A973A300086A3AE /* Raven.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EE5B0331A973A300086A3AE /* Raven.framework */; }; - 7EE5B0451A973A300086A3AE /* RavenTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE5B0441A973A300086A3AE /* RavenTests.m */; }; 7EE5B04C1A973A3E0086A3AE /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; 7EE5B04D1A973A3E0086A3AE /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; 7EE5B04E1A973A9F0086A3AE /* RavenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A46FED8156FA8D900D97F26 /* RavenClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7EE5B04F1A973A9F0086A3AE /* RavenConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BAEC13C168E6FC100408CDB /* RavenConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7EEE35281AB4688B00668C3E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FE9F156FA72300D97F26 /* Foundation.framework */; }; + 7EEE35291AB4688F00668C3E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FE9D156FA72300D97F26 /* UIKit.framework */; }; 8BAEC13E168E6FC100408CDB /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; 8BAEC142168E725100408CDB /* RavenConfigTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC141168E725100408CDB /* RavenConfigTest.m */; }; 8BAEC154168E747900408CDB /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; @@ -39,19 +41,19 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 7EE5B0211A9739A90086A3AE /* PBXContainerItemProxy */ = { + 7E7BFEFF1AB464E100FEB601 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0A46FE90156FA72300D97F26 /* Project object */; proxyType = 1; - remoteGlobalIDString = 7EE5B0141A9739A90086A3AE; - remoteInfo = RavenClient; + remoteGlobalIDString = 7EE5B0321A973A300086A3AE; + remoteInfo = Raven; }; - 7EE5B03F1A973A300086A3AE /* PBXContainerItemProxy */ = { + 7EE5B0211A9739A90086A3AE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0A46FE90156FA72300D97F26 /* Project object */; proxyType = 1; - remoteGlobalIDString = 7EE5B0321A973A300086A3AE; - remoteInfo = Raven; + remoteGlobalIDString = 7EE5B0141A9739A90086A3AE; + remoteInfo = RavenClient; }; /* End PBXContainerItemProxy section */ @@ -99,7 +101,6 @@ 7EE5B0331A973A300086A3AE /* Raven.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Raven.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7EE5B0361A973A300086A3AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7EE5B0371A973A300086A3AE /* Raven.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Raven.h; sourceTree = ""; }; - 7EE5B03D1A973A300086A3AE /* RavenTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RavenTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7EE5B0431A973A300086A3AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7EE5B0441A973A300086A3AE /* RavenTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RavenTests.m; sourceTree = ""; }; 8BAEC123168E6D0200408CDB /* RavenClient_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RavenClient_Private.h; sourceTree = ""; }; @@ -124,7 +125,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0A46FEBC156FA72300D97F26 /* SenTestingKit.framework in Frameworks */, + 7E7BFF011AB464E500FEB601 /* Raven.framework in Frameworks */, 0A46FEBD156FA72300D97F26 /* UIKit.framework in Frameworks */, 0A46FEBE156FA72300D97F26 /* Foundation.framework in Frameworks */, ); @@ -141,6 +142,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7EEE35291AB4688F00668C3E /* UIKit.framework in Frameworks */, + 7EEE35281AB4688B00668C3E /* Foundation.framework in Frameworks */, 7EE5B0201A9739A90086A3AE /* libRavenClient.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -152,14 +155,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7EE5B03A1A973A300086A3AE /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 7EE5B03E1A973A300086A3AE /* Raven.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -188,7 +183,6 @@ 7EE5B0151A9739A90086A3AE /* libRavenClient.a */, 7EE5B01F1A9739A90086A3AE /* RavenClientTests.xctest */, 7EE5B0331A973A300086A3AE /* Raven.framework */, - 7EE5B03D1A973A300086A3AE /* RavenTests.xctest */, ); name = Products; sourceTree = ""; @@ -357,6 +351,7 @@ buildRules = ( ); dependencies = ( + 7E7BFF001AB464E100FEB601 /* PBXTargetDependency */, ); name = RavenTests; productName = RavenTests; @@ -416,24 +411,6 @@ productReference = 7EE5B0331A973A300086A3AE /* Raven.framework */; productType = "com.apple.product-type.framework"; }; - 7EE5B03C1A973A300086A3AE /* RavenTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7EE5B0491A973A300086A3AE /* Build configuration list for PBXNativeTarget "RavenTests" */; - buildPhases = ( - 7EE5B0391A973A300086A3AE /* Sources */, - 7EE5B03A1A973A300086A3AE /* Frameworks */, - 7EE5B03B1A973A300086A3AE /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 7EE5B0401A973A300086A3AE /* PBXTargetDependency */, - ); - name = RavenTests; - productName = RavenTests; - productReference = 7EE5B03D1A973A300086A3AE /* RavenTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -452,9 +429,6 @@ 7EE5B0321A973A300086A3AE = { CreatedOnToolsVersion = 6.1.1; }; - 7EE5B03C1A973A300086A3AE = { - CreatedOnToolsVersion = 6.1.1; - }; }; }; buildConfigurationList = 0A46FE93156FA72300D97F26 /* Build configuration list for PBXProject "Raven" */; @@ -474,7 +448,6 @@ 7EE5B0141A9739A90086A3AE /* RavenClient */, 7EE5B01E1A9739A90086A3AE /* RavenClientTests */, 7EE5B0321A973A300086A3AE /* Raven */, - 7EE5B03C1A973A300086A3AE /* RavenTests */, ); }; /* End PBXProject section */ @@ -512,13 +485,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7EE5B03B1A973A300086A3AE /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -574,6 +540,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7E7BFEFE1AB464C000FEB601 /* RavenConfigTest.m in Sources */, + 7E7BFEFD1AB464BC00FEB601 /* RavenClientTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -586,27 +554,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 7EE5B0391A973A300086A3AE /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7EE5B0451A973A300086A3AE /* RavenTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 7E7BFF001AB464E100FEB601 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 7EE5B0321A973A300086A3AE /* Raven */; + targetProxy = 7E7BFEFF1AB464E100FEB601 /* PBXContainerItemProxy */; + }; 7EE5B0221A9739A90086A3AE /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 7EE5B0141A9739A90086A3AE /* RavenClient */; targetProxy = 7EE5B0211A9739A90086A3AE /* PBXContainerItemProxy */; }; - 7EE5B0401A973A300086A3AE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 7EE5B0321A973A300086A3AE /* Raven */; - targetProxy = 7EE5B03F1A973A300086A3AE /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -722,14 +682,22 @@ buildSettings = { BUNDLE_LOADER = ""; FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", "$(SDKROOT)/Developer/Library/Frameworks", "$(DEVELOPER_LIBRARY_DIR)/Frameworks", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Example/Raven-Prefix.pch"; GCC_VERSION = ""; INFOPLIST_FILE = "RavenTests/RavenTests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "-framework", + XCTest, + ); PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -742,13 +710,21 @@ buildSettings = { BUNDLE_LOADER = ""; FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", "$(SDKROOT)/Developer/Library/Frameworks", "$(DEVELOPER_LIBRARY_DIR)/Frameworks", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Example/Raven-Prefix.pch"; GCC_VERSION = ""; INFOPLIST_FILE = "RavenTests/RavenTests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + OTHER_LDFLAGS = ( + "-framework", + XCTest, + ); PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -827,6 +803,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -838,7 +815,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = RavenClientTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -862,6 +839,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -869,7 +847,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = RavenClientTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -950,70 +928,6 @@ }; name = Release; }; - 7EE5B04A1A973A300086A3AE /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = RavenTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 7EE5B04B1A973A300086A3AE /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = RavenTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1051,6 +965,7 @@ 7EE5B0281A9739A90086A3AE /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 7EE5B0291A9739A90086A3AE /* Build configuration list for PBXNativeTarget "RavenClientTests" */ = { isa = XCConfigurationList; @@ -1059,6 +974,7 @@ 7EE5B02B1A9739A90086A3AE /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven" */ = { isa = XCConfigurationList; @@ -1067,14 +983,7 @@ 7EE5B0481A973A300086A3AE /* Release */, ); defaultConfigurationIsVisible = 0; - }; - 7EE5B0491A973A300086A3AE /* Build configuration list for PBXNativeTarget "RavenTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7EE5B04A1A973A300086A3AE /* Debug */, - 7EE5B04B1A973A300086A3AE /* Release */, - ); - defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/RavenTests/RavenClientTest.h b/RavenTests/RavenClientTest.h index 9e8c30b..574f75f 100644 --- a/RavenTests/RavenClientTest.h +++ b/RavenTests/RavenClientTest.h @@ -6,7 +6,7 @@ // Copyright (c) 2012 Gangverk. All rights reserved. // -#import +#import #import "RavenClient_Private.h" @@ -18,7 +18,7 @@ @end -@interface RavenClientTest : SenTestCase +@interface RavenClientTest : XCTestCase @property MockRavenClient *client; diff --git a/RavenTests/RavenClientTest.m b/RavenTests/RavenClientTest.m index 6b53aba..b55580b 100644 --- a/RavenTests/RavenClientTest.m +++ b/RavenTests/RavenClientTest.m @@ -37,7 +37,7 @@ - (void)tearDown - (void)testGenerateUUID { NSString *uuid = [self.client generateUUID]; - STAssertEquals([uuid length], (NSUInteger)32, @"Invalid value for UUID returned: %@", uuid); + XCTAssertEqual([uuid length], (NSUInteger)32, @"Invalid value for UUID returned: %@", uuid); } - (void)testCaptureMessageWithOnlyMessage @@ -45,16 +45,16 @@ - (void)testCaptureMessageWithOnlyMessage [self.client captureMessage:@"An example message"]; NSDictionary *lastEvent = self.client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); - STAssertTrue([keys containsObject:@"message"], @"Missing message"); - STAssertTrue([keys containsObject:@"project"], @"Missing project"); - STAssertTrue([keys containsObject:@"level"], @"Missing level"); - STAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); + XCTAssertTrue([keys containsObject:@"message"], @"Missing message"); + XCTAssertTrue([keys containsObject:@"project"], @"Missing project"); + XCTAssertTrue([keys containsObject:@"level"], @"Missing level"); + XCTAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); - STAssertEquals([lastEvent valueForKey:@"project"], self.client.config.projectId, + XCTAssertEqual([lastEvent valueForKey:@"project"], self.client.config.projectId, @"Invalid value for project: %@", [lastEvent valueForKey:@"project"]); - STAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"info"], + XCTAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"info"], @"Invalid value for level: %@", [lastEvent valueForKey:@"level"]); } @@ -63,19 +63,19 @@ - (void)testCaptureMessageWithMessageAndLevel [self.client captureMessage:@"An example message" level:kRavenLogLevelDebugWarning]; NSDictionary *lastEvent = self.client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); - STAssertTrue([keys containsObject:@"message"], @"Missing message"); - STAssertTrue([keys containsObject:@"project"], @"Missing project"); - STAssertTrue([keys containsObject:@"level"], @"Missing level"); - STAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); - STAssertTrue([keys containsObject:@"platform"], @"Missing platform"); - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); + XCTAssertTrue([keys containsObject:@"message"], @"Missing message"); + XCTAssertTrue([keys containsObject:@"project"], @"Missing project"); + XCTAssertTrue([keys containsObject:@"level"], @"Missing level"); + XCTAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); + XCTAssertTrue([keys containsObject:@"platform"], @"Missing platform"); + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); - STAssertEquals([lastEvent valueForKey:@"project"], self.client.config.projectId, + XCTAssertEqual([lastEvent valueForKey:@"project"], self.client.config.projectId, @"Invalid value for project: %@", [lastEvent valueForKey:@"project"]); - STAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"warning"], + XCTAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"warning"], @"Invalid value for level: %@", [lastEvent valueForKey:@"level"]); - STAssertEquals([lastEvent valueForKey:@"platform"], @"objc", + XCTAssertEqual([lastEvent valueForKey:@"platform"], @"objc", @"Invalid value for platform: %@", [lastEvent valueForKey:@"platform"]); } @@ -86,20 +86,20 @@ - (void)testCaptureMessageWithMessageAndLevelAndMethodAndFileAndLine method:"method name" file:"filename" line:34]; NSDictionary *lastEvent = self.client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); - STAssertTrue([keys containsObject:@"message"], @"Missing message"); - STAssertTrue([keys containsObject:@"project"], @"Missing project"); - STAssertTrue([keys containsObject:@"level"], @"Missing level"); - STAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); - STAssertTrue([keys containsObject:@"platform"], @"Missing platform"); - STAssertTrue([keys containsObject:@"stacktrace"], @"Missing stacktrace"); - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); + XCTAssertTrue([keys containsObject:@"message"], @"Missing message"); + XCTAssertTrue([keys containsObject:@"project"], @"Missing project"); + XCTAssertTrue([keys containsObject:@"level"], @"Missing level"); + XCTAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); + XCTAssertTrue([keys containsObject:@"platform"], @"Missing platform"); + XCTAssertTrue([keys containsObject:@"stacktrace"], @"Missing stacktrace"); + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); - STAssertEquals([lastEvent valueForKey:@"project"], self.client.config.projectId, + XCTAssertEqual([lastEvent valueForKey:@"project"], self.client.config.projectId, @"Invalid value for project: %@", [lastEvent valueForKey:@"project"]); - STAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"warning"], + XCTAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"warning"], @"Invalid value for level: %@", [lastEvent valueForKey:@"level"]); - STAssertEquals([lastEvent valueForKey:@"platform"], @"objc", + XCTAssertEqual([lastEvent valueForKey:@"platform"], @"objc", @"Invalid value for platform: %@", [lastEvent valueForKey:@"platform"]); } @@ -112,25 +112,25 @@ - (void)testCaptureMessageWithMessageAndLevelAndExtraAndTags NSDictionary *lastEvent = self.client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); - STAssertTrue([keys containsObject:@"message"], @"Missing message"); - STAssertTrue([keys containsObject:@"project"], @"Missing project"); - STAssertTrue([keys containsObject:@"level"], @"Missing level"); - STAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); - STAssertTrue([keys containsObject:@"platform"], @"Missing platform"); - STAssertTrue([keys containsObject:@"extra"], @"Missing extra"); - STAssertTrue([keys containsObject:@"tags"], @"Missing tags"); - - STAssertEquals([lastEvent[@"extra"] objectForKey:@"key"], @"extra value", @"Missing extra data"); - STAssertEquals([lastEvent[@"tags"] objectForKey:@"key"], @"tag value", @"Missing tags data"); - - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertTrue([keys containsObject:@"event_id"], @"Missing event_id"); + XCTAssertTrue([keys containsObject:@"message"], @"Missing message"); + XCTAssertTrue([keys containsObject:@"project"], @"Missing project"); + XCTAssertTrue([keys containsObject:@"level"], @"Missing level"); + XCTAssertTrue([keys containsObject:@"timestamp"], @"Missing timestamp"); + XCTAssertTrue([keys containsObject:@"platform"], @"Missing platform"); + XCTAssertTrue([keys containsObject:@"extra"], @"Missing extra"); + XCTAssertTrue([keys containsObject:@"tags"], @"Missing tags"); + + XCTAssertEqual([lastEvent[@"extra"] objectForKey:@"key"], @"extra value", @"Missing extra data"); + XCTAssertEqual([lastEvent[@"tags"] objectForKey:@"key"], @"tag value", @"Missing tags data"); + + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); - STAssertEquals([lastEvent valueForKey:@"project"], self.client.config.projectId, + XCTAssertEqual([lastEvent valueForKey:@"project"], self.client.config.projectId, @"Invalid value for project: %@", [lastEvent valueForKey:@"project"]); - STAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"warning"], + XCTAssertTrue([[lastEvent valueForKey:@"level"] isEqualToString:@"warning"], @"Invalid value for level: %@", [lastEvent valueForKey:@"level"]); - STAssertEquals([lastEvent valueForKey:@"platform"], @"objc", + XCTAssertEqual([lastEvent valueForKey:@"platform"], @"objc", @"Invalid value for platform: %@", [lastEvent valueForKey:@"platform"]); } @@ -148,16 +148,16 @@ - (void)testClientWithExtraAndTags NSDictionary *lastEvent = client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"extra"], @"Missing extra"); - STAssertTrue([keys containsObject:@"tags"], @"Missing tags"); - STAssertEquals([lastEvent[@"extra"] objectForKey:@"key"], @"value", @"Missing extra data"); - STAssertEquals([lastEvent[@"tags"] objectForKey:@"key"], @"value", @"Missing tags data"); + XCTAssertTrue([keys containsObject:@"extra"], @"Missing extra"); + XCTAssertTrue([keys containsObject:@"tags"], @"Missing tags"); + XCTAssertEqual([lastEvent[@"extra"] objectForKey:@"key"], @"value", @"Missing extra data"); + XCTAssertEqual([lastEvent[@"tags"] objectForKey:@"key"], @"value", @"Missing tags data"); - STAssertEquals([lastEvent[@"extra"] objectForKey:@"key2"], @"extra value", @"Missing extra data"); - STAssertEquals([lastEvent[@"tags"] objectForKey:@"key2"], @"tag value", @"Missing tags data"); + XCTAssertEqual([lastEvent[@"extra"] objectForKey:@"key2"], @"extra value", @"Missing extra data"); + XCTAssertEqual([lastEvent[@"tags"] objectForKey:@"key2"], @"tag value", @"Missing tags data"); - STAssertNotNil([lastEvent[@"tags"] objectForKey:@"OS version"], @"Missing tags data"); - STAssertNotNil([lastEvent[@"tags"] objectForKey:@"Device model"], @"Missing tags data"); + XCTAssertNotNil([lastEvent[@"tags"] objectForKey:@"OS version"], @"Missing tags data"); + XCTAssertNotNil([lastEvent[@"tags"] objectForKey:@"Device model"], @"Missing tags data"); } - (void)testClientWithRewritingExtraAndTags @@ -174,11 +174,11 @@ - (void)testClientWithRewritingExtraAndTags NSDictionary *lastEvent = client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"extra"], @"Missing extra"); - STAssertTrue([keys containsObject:@"tags"], @"Missing tags"); + XCTAssertTrue([keys containsObject:@"extra"], @"Missing extra"); + XCTAssertTrue([keys containsObject:@"tags"], @"Missing tags"); - STAssertEquals([lastEvent[@"extra"] objectForKey:@"key"], @"extra value", @"Missing extra data"); - STAssertEquals([lastEvent[@"tags"] objectForKey:@"key"], @"tag value", @"Missing tags data"); + XCTAssertEqual([lastEvent[@"extra"] objectForKey:@"key"], @"extra value", @"Missing extra data"); + XCTAssertEqual([lastEvent[@"tags"] objectForKey:@"key"], @"tag value", @"Missing tags data"); } - (void)testClientWithLogger @@ -192,9 +192,9 @@ - (void)testClientWithLogger NSDictionary *lastEvent = client.lastEvent; - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); - STAssertEquals([lastEvent valueForKey:@"logger"], @"Logger value", + XCTAssertEqual([lastEvent valueForKey:@"logger"], @"Logger value", @"Invalid value for logger: %@", [lastEvent valueForKey:@"logger"]); } @@ -208,12 +208,12 @@ - (void)testClientWithUser NSDictionary *lastEvent = client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"user"], @"Missing user"); + XCTAssertTrue([keys containsObject:@"user"], @"Missing user"); - STAssertEquals([lastEvent[@"user"] objectForKey:@"username"], @"timor", @"Missing username"); - STAssertEquals([lastEvent[@"user"] objectForKey:@"ip_address"], @"127.0.0.1", @"Missing ip address"); + XCTAssertEqual([lastEvent[@"user"] objectForKey:@"username"], @"timor", @"Missing username"); + XCTAssertEqual([lastEvent[@"user"] objectForKey:@"ip_address"], @"127.0.0.1", @"Missing ip address"); - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); } @@ -227,12 +227,12 @@ - (void)testClientWithoutDSN NSDictionary *lastEvent = client.lastEvent; NSArray *keys = [lastEvent allKeys]; - STAssertTrue([keys containsObject:@"user"], @"Missing user"); + XCTAssertTrue([keys containsObject:@"user"], @"Missing user"); - STAssertEquals([lastEvent[@"user"] objectForKey:@"username"], @"timor", @"Missing username"); - STAssertEquals([lastEvent[@"user"] objectForKey:@"ip_address"], @"127.0.0.1", @"Missing ip address"); + XCTAssertEqual([lastEvent[@"user"] objectForKey:@"username"], @"timor", @"Missing username"); + XCTAssertEqual([lastEvent[@"user"] objectForKey:@"ip_address"], @"127.0.0.1", @"Missing ip address"); - STAssertEquals([lastEvent valueForKey:@"message"], @"An example message", + XCTAssertEqual([lastEvent valueForKey:@"message"], @"An example message", @"Invalid value for message: %@", [lastEvent valueForKey:@"message"]); } diff --git a/RavenTests/RavenConfigTest.h b/RavenTests/RavenConfigTest.h index 9e66845..a1a3358 100644 --- a/RavenTests/RavenConfigTest.h +++ b/RavenTests/RavenConfigTest.h @@ -6,8 +6,8 @@ // Copyright (c) 2012 Gangverk. All rights reserved. // -#import +#import -@interface RavenConfigTest : SenTestCase +@interface RavenConfigTest : XCTestCase @end diff --git a/RavenTests/RavenConfigTest.m b/RavenTests/RavenConfigTest.m index a8740a9..3e77c5e 100644 --- a/RavenTests/RavenConfigTest.m +++ b/RavenTests/RavenConfigTest.m @@ -16,15 +16,15 @@ - (void)testSetDSNWithPort RavenConfig *config = [RavenConfig alloc]; BOOL didParse = [config setDSN:@"http://public_key:secret_key@example.com:8000/project-id"]; - STAssertTrue(didParse, @"Failed to parse DSN"); + XCTAssertTrue(didParse, @"Failed to parse DSN"); - STAssertTrue([config.publicKey isEqualToString:@"public_key"], @"Got incorrect publicKey %@", config.publicKey); - STAssertTrue([config.secretKey isEqualToString:@"secret_key"], @"Got incorrect secretKey %@", config.secretKey); - STAssertTrue([config.projectId isEqualToString:@"project-id"], @"Got incorrect projectId %@", config.projectId); + XCTAssertTrue([config.publicKey isEqualToString:@"public_key"], @"Got incorrect publicKey %@", config.publicKey); + XCTAssertTrue([config.secretKey isEqualToString:@"secret_key"], @"Got incorrect secretKey %@", config.secretKey); + XCTAssertTrue([config.projectId isEqualToString:@"project-id"], @"Got incorrect projectId %@", config.projectId); NSString *expectedURL = @"http://example.com:8000/api/project-id/store/"; - STAssertTrue([[config.serverURL absoluteString] isEqualToString:expectedURL], @"Got incorrect serverURL %@", [config.serverURL absoluteString]); + XCTAssertTrue([[config.serverURL absoluteString] isEqualToString:expectedURL], @"Got incorrect serverURL %@", [config.serverURL absoluteString]); } - (void)testSetDSNWithSSLPortUndefined @@ -32,15 +32,15 @@ - (void)testSetDSNWithSSLPortUndefined RavenConfig *config = [RavenConfig alloc]; BOOL didParse = [config setDSN:@"https://public_key:secret_key@example.com/project-id"]; - STAssertTrue(didParse, @"Failed to parse DSN"); + XCTAssertTrue(didParse, @"Failed to parse DSN"); - STAssertTrue([config.publicKey isEqualToString:@"public_key"], @"Got incorrect publicKey %@", config.publicKey); - STAssertTrue([config.secretKey isEqualToString:@"secret_key"], @"Got incorrect secretKey %@", config.secretKey); - STAssertTrue([config.projectId isEqualToString:@"project-id"], @"Got incorrect projectId %@", config.projectId); + XCTAssertTrue([config.publicKey isEqualToString:@"public_key"], @"Got incorrect publicKey %@", config.publicKey); + XCTAssertTrue([config.secretKey isEqualToString:@"secret_key"], @"Got incorrect secretKey %@", config.secretKey); + XCTAssertTrue([config.projectId isEqualToString:@"project-id"], @"Got incorrect projectId %@", config.projectId); NSString *expectedURL = @"https://example.com:443/api/project-id/store/"; - STAssertTrue([[config.serverURL absoluteString] isEqualToString:expectedURL], @"Got incorrect serverURL %@", [config.serverURL absoluteString]); + XCTAssertTrue([[config.serverURL absoluteString] isEqualToString:expectedURL], @"Got incorrect serverURL %@", [config.serverURL absoluteString]); } - (void)testSetDSNWithoutSSLPortUndefined @@ -48,15 +48,15 @@ - (void)testSetDSNWithoutSSLPortUndefined RavenConfig *config = [RavenConfig alloc]; BOOL didParse = [config setDSN:@"http://public_key:secret_key@example.com/project-id"]; - STAssertTrue(didParse, @"Failed to parse DSN"); + XCTAssertTrue(didParse, @"Failed to parse DSN"); - STAssertTrue([config.publicKey isEqualToString:@"public_key"], @"Got incorrect publicKey %@", config.publicKey); - STAssertTrue([config.secretKey isEqualToString:@"secret_key"], @"Got incorrect secretKey %@", config.secretKey); - STAssertTrue([config.projectId isEqualToString:@"project-id"], @"Got incorrect projectId %@", config.projectId); + XCTAssertTrue([config.publicKey isEqualToString:@"public_key"], @"Got incorrect publicKey %@", config.publicKey); + XCTAssertTrue([config.secretKey isEqualToString:@"secret_key"], @"Got incorrect secretKey %@", config.secretKey); + XCTAssertTrue([config.projectId isEqualToString:@"project-id"], @"Got incorrect projectId %@", config.projectId); NSString *expectedURL = @"http://example.com:80/api/project-id/store/"; - STAssertTrue([[config.serverURL absoluteString] isEqualToString:expectedURL], @"Got incorrect serverURL %@", [config.serverURL absoluteString]); + XCTAssertTrue([[config.serverURL absoluteString] isEqualToString:expectedURL], @"Got incorrect serverURL %@", [config.serverURL absoluteString]); } From e4d37f1f54e7577d11c3be6d0281d096d9f02ba4 Mon Sep 17 00:00:00 2001 From: Alexander Dodatko Date: Sat, 14 Mar 2015 15:11:55 +0200 Subject: [PATCH 4/4] Renamed target. Added static iOS framework --- Raven (iOS) static/Info.plist | 26 +++ Raven.xcodeproj/project.pbxproj | 183 +++++++++++++++++- .../xcschemes/Raven-Carthage-iOS.xcscheme | 6 +- 3 files changed, 202 insertions(+), 13 deletions(-) create mode 100644 Raven (iOS) static/Info.plist diff --git a/Raven (iOS) static/Info.plist b/Raven (iOS) static/Info.plist new file mode 100644 index 0000000..70ce36e --- /dev/null +++ b/Raven (iOS) static/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + nl.mixedCase.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Raven.xcodeproj/project.pbxproj b/Raven.xcodeproj/project.pbxproj index c01d680..03d4d16 100644 --- a/Raven.xcodeproj/project.pbxproj +++ b/Raven.xcodeproj/project.pbxproj @@ -34,6 +34,10 @@ 7EE5B04F1A973A9F0086A3AE /* RavenConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BAEC13C168E6FC100408CDB /* RavenConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7EEE35281AB4688B00668C3E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FE9F156FA72300D97F26 /* Foundation.framework */; }; 7EEE35291AB4688F00668C3E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A46FE9D156FA72300D97F26 /* UIKit.framework */; }; + 7EEE35481AB46A8D00668C3E /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; + 7EEE35491AB46A9100668C3E /* RavenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A46FED8156FA8D900D97F26 /* RavenClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7EEE354A1AB46A9C00668C3E /* RavenConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BAEC13C168E6FC100408CDB /* RavenConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7EEE354B1AB46AA100668C3E /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; 8BAEC13E168E6FC100408CDB /* RavenConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC13D168E6FC100408CDB /* RavenConfig.m */; }; 8BAEC142168E725100408CDB /* RavenConfigTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BAEC141168E725100408CDB /* RavenConfigTest.m */; }; 8BAEC154168E747900408CDB /* RavenClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A46FED9156FA8D900D97F26 /* RavenClient.m */; }; @@ -103,6 +107,8 @@ 7EE5B0371A973A300086A3AE /* Raven.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Raven.h; sourceTree = ""; }; 7EE5B0431A973A300086A3AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7EE5B0441A973A300086A3AE /* RavenTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RavenTests.m; sourceTree = ""; }; + 7EEE352F1AB46A6800668C3E /* Raven.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Raven.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7EEE35321AB46A6800668C3E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8BAEC123168E6D0200408CDB /* RavenClient_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RavenClient_Private.h; sourceTree = ""; }; 8BAEC13C168E6FC100408CDB /* RavenConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RavenConfig.h; sourceTree = ""; }; 8BAEC13D168E6FC100408CDB /* RavenConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RavenConfig.m; sourceTree = ""; }; @@ -155,6 +161,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EEE352B1AB46A6800668C3E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -167,6 +180,7 @@ 7EE5B0231A9739A90086A3AE /* RavenClientTests */, 7EE5B0341A973A300086A3AE /* Raven */, 7EE5B0411A973A300086A3AE /* RavenTests */, + 7EEE35301AB46A6800668C3E /* Raven (iOS) static */, 0A46FE9C156FA72300D97F26 /* Frameworks */, 0A46FE9A156FA72300D97F26 /* Products */, 0A33DE39156FAA0B00AB3299 /* AUTHORS */, @@ -183,6 +197,7 @@ 7EE5B0151A9739A90086A3AE /* libRavenClient.a */, 7EE5B01F1A9739A90086A3AE /* RavenClientTests.xctest */, 7EE5B0331A973A300086A3AE /* Raven.framework */, + 7EEE352F1AB46A6800668C3E /* Raven.framework */, ); name = Products; sourceTree = ""; @@ -306,6 +321,22 @@ name = "Supporting Files"; sourceTree = ""; }; + 7EEE35301AB46A6800668C3E /* Raven (iOS) static */ = { + isa = PBXGroup; + children = ( + 7EEE35311AB46A6800668C3E /* Supporting Files */, + ); + path = "Raven (iOS) static"; + sourceTree = ""; + }; + 7EEE35311AB46A6800668C3E /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 7EEE35321AB46A6800668C3E /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -319,6 +350,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EEE352C1AB46A6800668C3E /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EEE354A1AB46A9C00668C3E /* RavenConfig.h in Headers */, + 7EEE35491AB46A9100668C3E /* RavenClient.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -393,9 +433,9 @@ productReference = 7EE5B01F1A9739A90086A3AE /* RavenClientTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 7EE5B0321A973A300086A3AE /* Raven */ = { + 7EE5B0321A973A300086A3AE /* Raven (iOS) */ = { isa = PBXNativeTarget; - buildConfigurationList = 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven" */; + buildConfigurationList = 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven (iOS)" */; buildPhases = ( 7EE5B02E1A973A300086A3AE /* Sources */, 7EE5B02F1A973A300086A3AE /* Frameworks */, @@ -406,11 +446,29 @@ ); dependencies = ( ); - name = Raven; + name = "Raven (iOS)"; productName = Raven; productReference = 7EE5B0331A973A300086A3AE /* Raven.framework */; productType = "com.apple.product-type.framework"; }; + 7EEE352E1AB46A6800668C3E /* Raven (iOS) static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7EEE35421AB46A6900668C3E /* Build configuration list for PBXNativeTarget "Raven (iOS) static" */; + buildPhases = ( + 7EEE352A1AB46A6800668C3E /* Sources */, + 7EEE352B1AB46A6800668C3E /* Frameworks */, + 7EEE352C1AB46A6800668C3E /* Headers */, + 7EEE352D1AB46A6800668C3E /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "Raven (iOS) static"; + productName = "Raven (iOS) static"; + productReference = 7EEE352F1AB46A6800668C3E /* Raven.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -429,6 +487,9 @@ 7EE5B0321A973A300086A3AE = { CreatedOnToolsVersion = 6.1.1; }; + 7EEE352E1AB46A6800668C3E = { + CreatedOnToolsVersion = 6.1.1; + }; }; }; buildConfigurationList = 0A46FE93156FA72300D97F26 /* Build configuration list for PBXProject "Raven" */; @@ -447,7 +508,8 @@ 0A46FEB9156FA72300D97F26 /* RavenTests */, 7EE5B0141A9739A90086A3AE /* RavenClient */, 7EE5B01E1A9739A90086A3AE /* RavenClientTests */, - 7EE5B0321A973A300086A3AE /* Raven */, + 7EE5B0321A973A300086A3AE /* Raven (iOS) */, + 7EEE352E1AB46A6800668C3E /* Raven (iOS) static */, ); }; /* End PBXProject section */ @@ -485,6 +547,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EEE352D1AB46A6800668C3E /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -554,12 +623,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 7EEE352A1AB46A6800668C3E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EEE354B1AB46AA100668C3E /* RavenConfig.m in Sources */, + 7EEE35481AB46A8D00668C3E /* RavenClient.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ 7E7BFF001AB464E100FEB601 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 7EE5B0321A973A300086A3AE /* Raven */; + target = 7EE5B0321A973A300086A3AE /* Raven (iOS) */; targetProxy = 7E7BFEFF1AB464E100FEB601 /* PBXContainerItemProxy */; }; 7EE5B0221A9739A90086A3AE /* PBXTargetDependency */ = { @@ -882,11 +960,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = Raven/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Raven; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -918,10 +996,87 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = Raven/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Raven; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 7EEE35431AB46A6900668C3E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = "Raven (iOS) static/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = NO; + PRODUCT_NAME = Raven; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 7EEE35441AB46A6900668C3E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = "Raven (iOS) static/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = NO; + PRODUCT_NAME = Raven; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -976,7 +1131,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven" */ = { + 7EE5B0461A973A300086A3AE /* Build configuration list for PBXNativeTarget "Raven (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( 7EE5B0471A973A300086A3AE /* Debug */, @@ -985,6 +1140,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 7EEE35421AB46A6900668C3E /* Build configuration list for PBXNativeTarget "Raven (iOS) static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7EEE35431AB46A6900668C3E /* Debug */, + 7EEE35441AB46A6900668C3E /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 0A46FE90156FA72300D97F26 /* Project object */; diff --git a/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme b/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme index b097dba..3288dd4 100644 --- a/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme +++ b/Raven.xcodeproj/xcshareddata/xcschemes/Raven-Carthage-iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "7EE5B0321A973A300086A3AE" BuildableName = "Raven.framework" - BlueprintName = "Raven" + BlueprintName = "Raven (iOS)" ReferencedContainer = "container:Raven.xcodeproj"> @@ -44,7 +44,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "7EE5B0321A973A300086A3AE" BuildableName = "Raven.framework" - BlueprintName = "Raven" + BlueprintName = "Raven (iOS)" ReferencedContainer = "container:Raven.xcodeproj"> @@ -62,7 +62,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "7EE5B0321A973A300086A3AE" BuildableName = "Raven.framework" - BlueprintName = "Raven" + BlueprintName = "Raven (iOS)" ReferencedContainer = "container:Raven.xcodeproj">