Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xcode 7 && iOS 9 #254

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

xcuserdata
*.xccheckout
*.gcno

src/build
.gitattributes
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/MRTests/MRNotificationTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/MRTests/MRTests-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
107 changes: 103 additions & 4 deletions src/Mudrammer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -1238,7 +1238,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = SPL;
LastUpgradeCheck = 0450;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "splinesoft LLC";
TargetAttributes = {
5E4F3CCD198D98650041A436 = {
Expand Down Expand Up @@ -1693,6 +1693,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;
Expand Down Expand Up @@ -1726,6 +1727,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;
Expand All @@ -1742,6 +1744,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;
Expand Down Expand Up @@ -1843,8 +1846,81 @@
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;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
"\"${PODS_ROOT}/Headers/Public\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/ARAnalytics\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/BlocksKit\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/DAKeyboardControl\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/Expecta\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/FXForms\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/HockeySDK-Source\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/IFTTTLaunchImage\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/JASidePanels\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/JSQSystemSoundPlayer\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/JTSImageViewController\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/KVOController\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/Keys\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/MagicalRecord\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/MagicalRecord/MagicalRecord\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/Masonry\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/MyLilTimer\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/OCMock\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/OSCache\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/QuickDialog\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SAMRateLimit\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SPLCore\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SPLUserActivity\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SSAccessibility\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SSApplication\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SSDataSources\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SSOperations\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/TOWebViewController\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/TTTAttributedLabel\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/VTAcknowledgementsViewController\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/libextobjc\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/libtelnet\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/uservoice-iphone-sdk\"",
"-fsanitize=address",
);
PRODUCT_BUNDLE_IDENTIFIER = com.splinesoft.theMUDRammer;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
Expand All @@ -1859,6 +1935,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;
};
Expand Down Expand Up @@ -1920,7 +2007,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*]" = "";
Expand All @@ -1935,6 +2023,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;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -28,7 +28,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "28E8945784384F0E8F276842"
BlueprintIdentifier = "37D0131558C68C677F36C6ED"
BuildableName = "libPods.a"
BlueprintName = "Pods"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
Expand All @@ -40,6 +40,7 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
Expand All @@ -62,6 +63,8 @@
ReferencedContainer = "container:Mudrammer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
Expand All @@ -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"
Expand All @@ -90,7 +96,8 @@
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5E591C781634C80C00F2EB9F"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -28,7 +28,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "28E8945784384F0E8F276842"
BlueprintIdentifier = "A4E8FC464AA1EF6A74A58BE9"
BuildableName = "libPods.a"
BlueprintName = "Pods"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
Expand Down Expand Up @@ -62,6 +62,8 @@
ReferencedContainer = "container:Mudrammer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
Expand All @@ -71,8 +73,10 @@
buildConfiguration = "Release"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5E591C781634C80C00F2EB9F"
Expand All @@ -90,7 +94,8 @@
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5E591C781634C80C00F2EB9F"
Expand Down
2 changes: 1 addition & 1 deletion src/Mudrammer/Additions/JSQSystemSoundPlayer+SSAdditions.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/Mudrammer/Additions/JSQSystemSoundPlayer+SSAdditions.m
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions src/Mudrammer/Additions/NSDate+SPLAdditions.m
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading