Xcode-7 WIP

splinesoft · Jun 28, 2015 · 9a84ec6 · 9a84ec6
1 parent 7d46f5f
commit 9a84ec6
Show file tree

Hide file tree

Showing 51 changed files with 5,964 additions and 5,916 deletions.
diff --git a/circle.yml b/circle.yml
@@ -3,7 +3,7 @@ machine:
     LANG: en_US.UTF-8
     LC_CTYPE: en_US.UTF-8
   xcode:
-    version: "6.3.1"
+    version: "7.0"
 dependencies:
   pre:
     - xcrun instruments -w "iPhone 6 (8.3 Simulator)" || exit 0

diff --git a/src/MRTests/MRNotificationTests.m b/src/MRTests/MRNotificationTests.m
@@ -30,10 +30,6 @@ - (void)tearDown {
     manager = nil;
 }
 
-- (void)testUsesNewNotificationSystem {
-    XCTAssertTrue(manager.usesNewNotificationSystem, @"Should be running on 8+");
-}
-
 - (void)testRegisteringForNotifications {
     XCTAssertFalse(manager.askedForLocalNotifications, @"Should initially not notify");
     XCTAssertNil(manager.userNotificationSettings, @"Should not have settings to start");

diff --git a/src/MRTests/MRTests-Info.plist b/src/MRTests/MRTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.splinesoft.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/src/Mudrammer.xcodeproj/project.pbxproj b/src/Mudrammer.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5E004D9F194D522A00EE1448 /* SPLImagesCatalog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E004D9E194D522A00EE1448 /* SPLImagesCatalog.m */; };
+		5E004D9F194D522A00EE1448 /* SPLImagesCatalog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E004D9E194D522A00EE1448 /* SPLImagesCatalog.m */; settings = {COMPILER_FLAGS = "-Wno-semicolon-before-method-body"; }; };
 		5E004DA4194D53DA00EE1448 /* SSANSIEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E004DA1194D53DA00EE1448 /* SSANSIEngine.m */; };
 		5E004DA5194D53DA00EE1448 /* SSAttributedLineGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E004DA3194D53DA00EE1448 /* SSAttributedLineGroup.m */; };
 		5E004DA8194D543300EE1448 /* SSThemes.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E004DA7194D543300EE1448 /* SSThemes.m */; };
@@ -1235,7 +1235,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SPL;
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "splinesoft LLC";
 				TargetAttributes = {
 					5E4F3CCD198D98650041A436 = {
@@ -1689,6 +1689,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = "MRTests/MRTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
@@ -1722,6 +1723,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = "MRTests/MRTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
@@ -1738,6 +1740,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
@@ -1839,8 +1842,9 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				INFOPLIST_FILE = "Mudrammer/Supporting Files/Mudrammer-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.splinesoft.theMUDRammer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1855,6 +1859,17 @@
 					"-Wfloat-equal",
 					"-Wbridge-cast",
 					"-Wnewline-eof",
+					"-Weverything",
+					"-Wno-auto-import",
+					"-Wno-objc-missing-property-synthesis",
+					"-Wno-direct-ivar-access",
+					"-Wno-assign-enum",
+					"-Wno-gnu-statement-expression",
+					"-Wno-implicit-retain-self",
+					"-Wno-cast-qual",
+					"-Wno-cstring-format-directive",
+					"-Wno-pedantic",
+					"-Wno-switch-enum",
 				);
 				WRAPPER_EXTENSION = app;
 			};
@@ -1916,7 +1931,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				INFOPLIST_FILE = "Mudrammer/Supporting Files/Mudrammer-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.splinesoft.theMUDRammer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1931,6 +1947,17 @@
 					"-Wfloat-equal",
 					"-Wbridge-cast",
 					"-Wnewline-eof",
+					"-Weverything",
+					"-Wno-auto-import",
+					"-Wno-objc-missing-property-synthesis",
+					"-Wno-direct-ivar-access",
+					"-Wno-assign-enum",
+					"-Wno-gnu-statement-expression",
+					"-Wno-implicit-retain-self",
+					"-Wno-cast-qual",
+					"-Wno-cstring-format-directive",
+					"-Wno-pedantic",
+					"-Wno-switch-enum",
 				);
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/src/Mudrammer.xcodeproj/xcshareddata/xcschemes/MUDRammer Dev.xcscheme b/src/Mudrammer.xcodeproj/xcshareddata/xcschemes/MUDRammer Dev.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "28E8945784384F0E8F276842"
+               BlueprintIdentifier = "37D0131558C68C677F36C6ED"
                BuildableName = "libPods.a"
                BlueprintName = "Pods"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -40,6 +40,7 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
       buildConfiguration = "Debug">
       <Testables>
          <TestableReference
@@ -62,6 +63,8 @@
             ReferencedContainer = "container:Mudrammer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,8 +74,11 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      enableAddressSanitizer = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5E591C781634C80C00F2EB9F"
@@ -90,7 +96,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5E591C781634C80C00F2EB9F"

diff --git a/src/Mudrammer.xcodeproj/xcshareddata/xcschemes/MUDRammer Release.xcscheme b/src/Mudrammer.xcodeproj/xcshareddata/xcschemes/MUDRammer Release.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "28E8945784384F0E8F276842"
+               BlueprintIdentifier = "A4E8FC464AA1EF6A74A58BE9"
                BuildableName = "libPods.a"
                BlueprintName = "Pods"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -62,6 +62,8 @@
             ReferencedContainer = "container:Mudrammer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,8 +73,10 @@
       buildConfiguration = "Release"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5E591C781634C80C00F2EB9F"
@@ -90,7 +94,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5E591C781634C80C00F2EB9F"

diff --git a/src/Mudrammer/Additions/JSQSystemSoundPlayer+SSAdditions.h b/src/Mudrammer/Additions/JSQSystemSoundPlayer+SSAdditions.h
@@ -43,7 +43,7 @@
 @property (nonatomic, copy, readonly) NSString * soundName;
 
 - (instancetype) initWithFileName:(NSString *)fileName
-                        soundName:(NSString *)soundName NS_DESIGNATED_INITIALIZER;
+                        soundName:(NSString *)soundName;
 
 + (NSComparator) soundNameComparator;
 

diff --git a/src/Mudrammer/Additions/JSQSystemSoundPlayer+SSAdditions.m b/src/Mudrammer/Additions/JSQSystemSoundPlayer+SSAdditions.m
@@ -38,10 +38,10 @@ - (NSString *)description {
             self.soundName];
 }
 
-- (BOOL)isEqual:(SSSound *)object {
+- (BOOL)isEqual:(id)object {
     return [object isKindOfClass:[SSSound class]]
-        && [object.soundName isEqualToString:self.soundName]
-        && [object.fileName isEqualToString:self.fileName];
+        && [((SSSound *)object).soundName isEqualToString:self.soundName]
+        && [((SSSound *)object).fileName isEqualToString:self.fileName];
 }
 
 - (NSUInteger)hash {

diff --git a/src/Mudrammer/Additions/NSDate+SPLAdditions.m b/src/Mudrammer/Additions/NSDate+SPLAdditions.m
@@ -36,8 +36,11 @@ - (NSString *)SPLTimeSinceValue {
     } else if (interval < 60 * 60 * 24) {
         return [NSString stringWithFormat:@"%@ hours", @(SPLFloat_round((CGFloat)interval / (60 * 60)))];
     } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wbad-function-cast"
         NSInteger days = (NSInteger)SPLFloat_floor((CGFloat)interval / (60 * 60 * 24));
         NSInteger hours = (NSInteger)SPLFloat_floor(((CGFloat)interval - (days * 60 * 60 * 24)) / (60 * 60));
+#pragma clang diagnostic pop
         NSMutableString *str = [NSMutableString string];
 
         if (days > 0) {