From c8d7550df426b8923066c6ed0e70e4fd3af724d2 Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 13 Dec 2013 16:56:37 +0000 Subject: [PATCH 1/4] Updated project to build on Xcode 5 --- Project/semver.xcodeproj/project.pbxproj | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Project/semver.xcodeproj/project.pbxproj b/Project/semver.xcodeproj/project.pbxproj index 4acc7dd..e0044dd 100644 --- a/Project/semver.xcodeproj/project.pbxproj +++ b/Project/semver.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - C336CFF8178BC2F300D35D67 /* Base.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = C336CFF4178BC2F300D35D67 /* Base.xcconfig */; }; - C336CFFA178BC2F300D35D67 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = C336CFF5178BC2F300D35D67 /* Debug.xcconfig */; }; - C336CFFC178BC2F300D35D67 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = C336CFF6178BC2F300D35D67 /* Release.xcconfig */; }; C381967817865BA500C5FE78 /* EDSemverParse.m in Sources */ = {isa = PBXBuildFile; fileRef = C381967717865BA500C5FE78 /* EDSemverParse.m */; }; C381967F17865CB600C5FE78 /* EDSemverValid.m in Sources */ = {isa = PBXBuildFile; fileRef = C381967E17865CB600C5FE78 /* EDSemverValid.m */; }; C38196821786722200C5FE78 /* EDSemverBenchmark.m in Sources */ = {isa = PBXBuildFile; fileRef = C38196811786722200C5FE78 /* EDSemverBenchmark.m */; }; @@ -192,7 +189,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = ED; - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0500; ORGANIZATIONNAME = "Andrew Sliwinski"; }; buildConfigurationList = C390380B178615E400ECBCAC /* Build configuration list for PBXProject "semver" */; @@ -218,9 +215,6 @@ buildActionMask = 2147483647; files = ( C3903842178615E400ECBCAC /* InfoPlist.strings in Resources */, - C336CFF8178BC2F300D35D67 /* Base.xcconfig in Resources */, - C336CFFA178BC2F300D35D67 /* Debug.xcconfig in Resources */, - C336CFFC178BC2F300D35D67 /* Release.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -295,7 +289,9 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = YES; @@ -320,7 +316,9 @@ COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; @@ -332,7 +330,6 @@ C390384C178615E400ECBCAC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/semver.app/semver"; FRAMEWORK_SEARCH_PATHS = ( "\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", @@ -341,7 +338,6 @@ GCC_PREFIX_HEADER = "semver/semver-Prefix.pch"; INFOPLIST_FILE = "semverTests/semverTests-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -349,7 +345,6 @@ C390384D178615E400ECBCAC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/semver.app/semver"; FRAMEWORK_SEARCH_PATHS = ( "\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", @@ -358,7 +353,6 @@ GCC_PREFIX_HEADER = "semver/semver-Prefix.pch"; INFOPLIST_FILE = "semverTests/semverTests-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = octest; }; name = Release; From e57ae4cd50e4389b9a651b5175b9a4f0abb56d36 Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 13 Dec 2013 17:04:12 +0000 Subject: [PATCH 2/4] Removed test headers --- Project/semverTests/EDSemverBenchmark.h | 13 ------------- Project/semverTests/EDSemverBenchmark.m | 5 ++++- Project/semverTests/EDSemverEqualTo.h | 13 ------------- Project/semverTests/EDSemverEqualTo.m | 5 ++++- Project/semverTests/EDSemverGreaterThan.h | 13 ------------- Project/semverTests/EDSemverGreaterThan.m | 5 ++++- Project/semverTests/EDSemverLessThan.h | 13 ------------- Project/semverTests/EDSemverLessThan.m | 5 ++++- Project/semverTests/EDSemverParse.h | 13 ------------- Project/semverTests/EDSemverParse.m | 5 ++++- Project/semverTests/EDSemverValid.h | 13 ------------- Project/semverTests/EDSemverValid.m | 5 ++++- 12 files changed, 24 insertions(+), 84 deletions(-) delete mode 100644 Project/semverTests/EDSemverBenchmark.h delete mode 100644 Project/semverTests/EDSemverEqualTo.h delete mode 100644 Project/semverTests/EDSemverGreaterThan.h delete mode 100644 Project/semverTests/EDSemverLessThan.h delete mode 100644 Project/semverTests/EDSemverParse.h delete mode 100644 Project/semverTests/EDSemverValid.h diff --git a/Project/semverTests/EDSemverBenchmark.h b/Project/semverTests/EDSemverBenchmark.h deleted file mode 100644 index 5fccd5f..0000000 --- a/Project/semverTests/EDSemverBenchmark.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EDSemverBenchmark.h -// semver -// -// Created by Andrew Sliwinski on 7/4/13. -// Copyright (c) 2013 Andrew Sliwinski. All rights reserved. -// - -#import "EDSemverHarness.h" - -@interface EDSemverBenchmark : SenTestCase - -@end diff --git a/Project/semverTests/EDSemverBenchmark.m b/Project/semverTests/EDSemverBenchmark.m index de6403a..fec5171 100644 --- a/Project/semverTests/EDSemverBenchmark.m +++ b/Project/semverTests/EDSemverBenchmark.m @@ -6,7 +6,10 @@ // Copyright (c) 2013 Andrew Sliwinski. All rights reserved. // -#import "EDSemverBenchmark.h" +#import "EDSemverHarness.h" + +@interface EDSemverBenchmark : SenTestCase +@end @interface EDSemverBenchmark () @property NSArray *list; diff --git a/Project/semverTests/EDSemverEqualTo.h b/Project/semverTests/EDSemverEqualTo.h deleted file mode 100644 index 13c0bef..0000000 --- a/Project/semverTests/EDSemverEqualTo.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EDSemverEqualTo.h -// semver -// -// Created by Andrew Sliwinski on 7/4/13. -// Copyright (c) 2013 Andrew Sliwinski. All rights reserved. -// - -#import "EDSemverHarness.h" - -@interface EDSemverEqualTo : SenTestCase - -@end diff --git a/Project/semverTests/EDSemverEqualTo.m b/Project/semverTests/EDSemverEqualTo.m index d36de61..080672b 100644 --- a/Project/semverTests/EDSemverEqualTo.m +++ b/Project/semverTests/EDSemverEqualTo.m @@ -6,7 +6,10 @@ // Copyright (c) 2013 Andrew Sliwinski. All rights reserved. // -#import "EDSemverEqualTo.h" +#import "EDSemverHarness.h" + +@interface EDSemverEqualTo : SenTestCase +@end @implementation EDSemverEqualTo diff --git a/Project/semverTests/EDSemverGreaterThan.h b/Project/semverTests/EDSemverGreaterThan.h deleted file mode 100644 index 179933e..0000000 --- a/Project/semverTests/EDSemverGreaterThan.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EDSemverGreaterThan.h -// semver -// -// Created by Andrew Sliwinski on 7/7/13. -// Copyright (c) 2013 Andrew Sliwinski. All rights reserved. -// - -#import "EDSemverHarness.h" - -@interface EDSemverGreaterThan : SenTestCase - -@end diff --git a/Project/semverTests/EDSemverGreaterThan.m b/Project/semverTests/EDSemverGreaterThan.m index 29ba3c7..14fd3c2 100644 --- a/Project/semverTests/EDSemverGreaterThan.m +++ b/Project/semverTests/EDSemverGreaterThan.m @@ -6,7 +6,10 @@ // Copyright (c) 2013 Andrew Sliwinski. All rights reserved. // -#import "EDSemverGreaterThan.h" +#import "EDSemverHarness.h" + +@interface EDSemverGreaterThan : SenTestCase +@end @implementation EDSemverGreaterThan diff --git a/Project/semverTests/EDSemverLessThan.h b/Project/semverTests/EDSemverLessThan.h deleted file mode 100644 index b9fdd53..0000000 --- a/Project/semverTests/EDSemverLessThan.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EDSemverLessThan.h -// semver -// -// Created by Andrew Sliwinski on 7/4/13. -// Copyright (c) 2013 Andrew Sliwinski. All rights reserved. -// - -#import "EDSemverHarness.h" - -@interface EDSemverLessThan : SenTestCase - -@end diff --git a/Project/semverTests/EDSemverLessThan.m b/Project/semverTests/EDSemverLessThan.m index 4021346..07df77f 100644 --- a/Project/semverTests/EDSemverLessThan.m +++ b/Project/semverTests/EDSemverLessThan.m @@ -6,7 +6,10 @@ // Copyright (c) 2013 Andrew Sliwinski. All rights reserved. // -#import "EDSemverLessThan.h" +#import "EDSemverHarness.h" + +@interface EDSemverLessThan : SenTestCase +@end @implementation EDSemverLessThan diff --git a/Project/semverTests/EDSemverParse.h b/Project/semverTests/EDSemverParse.h deleted file mode 100644 index 0c895f4..0000000 --- a/Project/semverTests/EDSemverParse.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EDSemverParse.h -// semver -// -// Created by Andrew Sliwinski on 7/4/13. -// Copyright (c) 2013 Andrew Sliwinski. All rights reserved. -// - -#import "EDSemverHarness.h" - -@interface EDSemverParse : SenTestCase - -@end diff --git a/Project/semverTests/EDSemverParse.m b/Project/semverTests/EDSemverParse.m index 5eb7e27..639b63c 100644 --- a/Project/semverTests/EDSemverParse.m +++ b/Project/semverTests/EDSemverParse.m @@ -6,7 +6,10 @@ // Copyright (c) 2013 Andrew Sliwinski. All rights reserved. // -#import "EDSemverParse.h" +#import "EDSemverHarness.h" + +@interface EDSemverParse : SenTestCase +@end @implementation EDSemverParse diff --git a/Project/semverTests/EDSemverValid.h b/Project/semverTests/EDSemverValid.h deleted file mode 100644 index fc50b3f..0000000 --- a/Project/semverTests/EDSemverValid.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// EDSemverValid.h -// semver -// -// Created by Andrew Sliwinski on 7/4/13. -// Copyright (c) 2013 Andrew Sliwinski. All rights reserved. -// - -#import "EDSemverHarness.h" - -@interface EDSemverValid : SenTestCase - -@end diff --git a/Project/semverTests/EDSemverValid.m b/Project/semverTests/EDSemverValid.m index d412494..4923d08 100644 --- a/Project/semverTests/EDSemverValid.m +++ b/Project/semverTests/EDSemverValid.m @@ -6,7 +6,10 @@ // Copyright (c) 2013 Andrew Sliwinski. All rights reserved. // -#import "EDSemverValid.h" +#import "EDSemverHarness.h" + +@interface EDSemverValid : SenTestCase +@end @interface EDSemverValid () @property NSArray *validList; From 3c7e3aa76e701514e8a85111a51422e023472a3f Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 13 Dec 2013 17:06:30 +0000 Subject: [PATCH 3/4] I guess Xcode would like this to be committed as well --- Project/semver.xcodeproj/xcshareddata/xcschemes/semver.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project/semver.xcodeproj/xcshareddata/xcschemes/semver.xcscheme b/Project/semver.xcodeproj/xcshareddata/xcschemes/semver.xcscheme index 77cce87..82da67c 100644 --- a/Project/semver.xcodeproj/xcshareddata/xcschemes/semver.xcscheme +++ b/Project/semver.xcodeproj/xcshareddata/xcschemes/semver.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 16 Dec 2013 14:07:44 +0000 Subject: [PATCH 4/4] Added missing project.pbxproj update! --- Project/semver.xcodeproj/project.pbxproj | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Project/semver.xcodeproj/project.pbxproj b/Project/semver.xcodeproj/project.pbxproj index e0044dd..9174bb3 100644 --- a/Project/semver.xcodeproj/project.pbxproj +++ b/Project/semver.xcodeproj/project.pbxproj @@ -24,14 +24,10 @@ C336CFF4178BC2F300D35D67 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = ""; }; C336CFF5178BC2F300D35D67 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; C336CFF6178BC2F300D35D67 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - C381967617865BA500C5FE78 /* EDSemverParse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverParse.h; sourceTree = ""; }; C381967717865BA500C5FE78 /* EDSemverParse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSemverParse.m; sourceTree = ""; }; C381967917865C0A00C5FE78 /* EDSemverHarness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverHarness.h; sourceTree = ""; }; - C381967D17865CB600C5FE78 /* EDSemverValid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverValid.h; sourceTree = ""; }; C381967E17865CB600C5FE78 /* EDSemverValid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSemverValid.m; sourceTree = ""; }; - C38196801786722200C5FE78 /* EDSemverBenchmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverBenchmark.h; sourceTree = ""; }; C38196811786722200C5FE78 /* EDSemverBenchmark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSemverBenchmark.m; sourceTree = ""; }; - C3819683178676E100C5FE78 /* EDSemverEqualTo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverEqualTo.h; sourceTree = ""; }; C3819684178676E100C5FE78 /* EDSemverEqualTo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSemverEqualTo.m; sourceTree = ""; }; C381969C178679AF00C5FE78 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = ""; }; C381969E178679AF00C5FE78 /* semver-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "semver-Info.plist"; sourceTree = ""; }; @@ -47,9 +43,7 @@ C3903853178616E500ECBCAC /* EDSemver.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = EDSemver.podspec; path = ../EDSemver.podspec; sourceTree = ""; }; C3903854178616E500ECBCAC /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE.md; path = ../LICENSE.md; sourceTree = ""; }; C3903855178616E500ECBCAC /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; - C3A8AB7E178A39A000EE322C /* EDSemverGreaterThan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverGreaterThan.h; sourceTree = ""; }; C3A8AB7F178A39A000EE322C /* EDSemverGreaterThan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSemverGreaterThan.m; sourceTree = ""; }; - C3D242011786843C0019F61A /* EDSemverLessThan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSemverLessThan.h; sourceTree = ""; }; C3D242021786843C0019F61A /* EDSemverLessThan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSemverLessThan.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -124,17 +118,11 @@ C390383D178615E400ECBCAC /* Tests */ = { isa = PBXGroup; children = ( - C38196801786722200C5FE78 /* EDSemverBenchmark.h */, C38196811786722200C5FE78 /* EDSemverBenchmark.m */, - C3819683178676E100C5FE78 /* EDSemverEqualTo.h */, C3819684178676E100C5FE78 /* EDSemverEqualTo.m */, - C3A8AB7E178A39A000EE322C /* EDSemverGreaterThan.h */, C3A8AB7F178A39A000EE322C /* EDSemverGreaterThan.m */, - C3D242011786843C0019F61A /* EDSemverLessThan.h */, C3D242021786843C0019F61A /* EDSemverLessThan.m */, - C381967617865BA500C5FE78 /* EDSemverParse.h */, C381967717865BA500C5FE78 /* EDSemverParse.m */, - C381967D17865CB600C5FE78 /* EDSemverValid.h */, C381967E17865CB600C5FE78 /* EDSemverValid.m */, C381967C17865C6C00C5FE78 /* Fixtures */, C390383E178615E400ECBCAC /* Supporting Files */,