Skip to content

Commit

Permalink
Updated for Xcode8 and updated Fragaria.
Browse files Browse the repository at this point in the history
  • Loading branch information
@blommegard
blommegard committed Sep 19, 2016
1 parent 119d0c3 commit bc25992
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
11 changes: 10 additions & 1 deletion Knuff.xcodeproj/project.pbxproj
View file
Expand Up @@ -318,12 +318,13 @@
F45929F51AB475D000041A6C /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0710;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = Bowtie;
TargetAttributes = {
F45929FC1AB475D000041A6C = {
CreatedOnToolsVersion = 6.2;
DevelopmentTeam = N2ML8MSSRH;
LastSwiftMigration = 0800;
SystemCapabilities = {
com.apple.Sandbox = {
enabled = 1;
Expand Down Expand Up @@ -525,8 +526,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
Expand All @@ -535,6 +538,7 @@
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand Down Expand Up @@ -567,8 +571,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
Expand All @@ -577,6 +583,7 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand Down Expand Up @@ -608,6 +615,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.madebybowtie.Knuff-OSX";
PRODUCT_NAME = Knuff;
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -630,6 +638,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.madebybowtie.Knuff-OSX";
PRODUCT_NAME = Knuff;
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
4 changes: 2 additions & 2 deletions Knuff.xcworkspace/xcshareddata/Knuff.xcscmblueprint
View file
Expand Up @@ -11,8 +11,8 @@
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B6980B18-3972-4524-8795-8AEC02DB2606",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"80B4CF699024FCB46131A586963D91BB1BCBA073" : "APNS-Pusher",
"150A68F5D81F7D884442B46FF5668B805BE44A33" : "APNS-PusherVendor\/Fragaria",
"80B4CF699024FCB46131A586963D91BB1BCBA073" : "Knuff\/",
"150A68F5D81F7D884442B46FF5668B805BE44A33" : "Knuff\/Vendor\/Fragaria\/",
"59BCCFF68011542A051983972F0A0E4EA5C0D708" : "APNS-Pusher\/Vendor\/pegkit",
"948C6829607794C9C905880E4DE9DD942A04092A" : "APNS-Pusher\/Vendor\/pegkit\/lib\/TDTemplateEngine"
},
Expand Down
2 changes: 1 addition & 1 deletion Vendor/Fragaria
Submodule Fragaria updated 88 files
+3 −1 .gitignore
+2 −6 Applications/Doc/Fragaria_Document-Info.plist
+1 −0 Applications/Doc/MyDocument.h
+13 −24 Applications/Doc/MyDocument.m
+9 −18 Applications/Fragaria Swift/AppDelegate.swift
+6 −6 Applications/Fragaria Swift/Document.swift
+0 −0 Applications/Fragaria Swift/en.lproj/Document.xib
+0 −0 Applications/Fragaria Swift/en.lproj/MainMenu.xib
+1 −1 Applications/MGSFragariaView/AppDelegate.m
+30 −19 Applications/MGSFragariaViewModern/AppDelegate.m
+2 −4 Applications/MGSFragariaViewModern/MGSSampleBreakpointDelegate.h
+70 −36 Applications/MGSFragariaViewModern/MGSSampleBreakpointDelegate.m
+3 −0 Applications/Simple/FragariaAppDelegate.h
+15 −11 Applications/Simple/FragariaAppDelegate.m
+848 −3,933 Applications/Simple/MainMenu.xib
+2,413 −0 Doxygen/Doxyfile
+532 −49 Fragaria.xcodeproj/project.pbxproj
+ − Images.xcassets/messagesAccess.imageset/messagesAccess.pdf
+ − Images.xcassets/messagesConfig.imageset/messagesConfig.pdf
+ − Images.xcassets/messagesDocument.imageset/messagesDocument.pdf
+ − Images.xcassets/messagesError.imageset/messagesError.pdf
+ − Images.xcassets/messagesInfo.imageset/messagesInfo.pdf
+ − Images.xcassets/messagesPanic.imageset/messagesPanic.pdf
+ − Images.xcassets/messagesWarning.imageset/messagesWarning.pdf
+1 −1 MGSBoolToColourTransformer.h
+1 −1 MGSBoolToGlobalHintTransformer.h
+28 −8 MGSBreakpointDelegate.h
+1 −1 MGSColourScheme.h
+1 −1 MGSColourSchemeController.h
+1 −1 MGSColourSchemeSaveController.h
+1 −1 MGSColourToPlainTextTransformer.h
+1 −0 MGSExtraInterfaceController.h
+1 −1 MGSFontWell.h
+114 −0 MGSFragaria Tests/MGSFragariaRowColumnFunctionsTests.m
+281 −0 MGSFragaria Tests/MGSLineNumberCacheTests.m
+85 −0 MGSFragaria Tests/MGSLineRangeForCharacterTests.m
+108 −0 MGSFragaria Tests/MGSStringColumnTests.m
+2 −21 MGSFragaria Tests/MGSSyntaxErrorControllerTests.m
+18 −31 MGSFragaria Tests/MGSUserDefaultsControllerTests.m
+13 −13 MGSFragariaView+Definitions.h
+92 −36 MGSFragariaView.h
+35 −0 MGSFragariaView.m
+7 −2 MGSFragariaViewPrivate.h
+2 −2 MGSHybridUserDefaultsController.h
+7 −4 MGSLineNumberView.h
+216 −243 MGSLineNumberView.m
+24 −0 MGSLineNumberViewDecoration.h
+1 −1 MGSMutableSubstring.h
+3 −3 MGSPreferencesProxyDictionary.h
+6 −6 MGSPreferencesProxyDictionary.m
+12 −9 MGSSyntaxController.m
+1 −1 MGSSyntaxDefinition.h
+1 −12 MGSSyntaxErrorController.h
+11 −50 MGSSyntaxErrorController.m
+1 −1 MGSUserDefaults.h
+2 −2 MGSUserDefaultsController.h
+2 −2 MGSUserDefaultsController.m
+5 −2 MGSUserDefaultsControllerProtocol.h
+1 −1 NSColor+TransformedCompare.h
+1 −1 NSObject+Fragaria.h
+1 −0 NSScanner+Fragaria.h
+22 −0 NSSet+Fragaria.h
+147 −0 NSSet+Fragaria.m
+19 −2 NSString+Fragaria.h
+48 −4 NSString+Fragaria.m
+54 −0 NSTextStorage+Fragaria.h
+329 −0 NSTextStorage+Fragaria.m
+2 −2 README.md
+1 −1 SMLAutoCompleteDelegate.h
+1 −0 SMLLayoutManager.h
+1 −0 SMLSyntaxColouring.h
+5 −2 SMLSyntaxColouring.m
+16 −17 SMLSyntaxColouringDelegate.h
+10 −1 SMLSyntaxError.h
+27 −20 SMLTextView+MGSTextActions.m
+53 −0 SMLTextView.h
+193 −126 SMLTextView.m
+1 −1 SMLTextViewPrivate.h
+7 −12 en-GB.lproj/SMLDetab.xib
+8 −10 en-GB.lproj/SMLEntab.xib
+10 −11 en-GB.lproj/SMLGoToLine.xib
+8 −8 en.lproj/MGSColourSchemeSave.xib
+2 −55 en.lproj/MGSPrefsColourProperties.xib
+3 −3 en.lproj/MGSPrefsCommonViews.xib
+27 −36 en.lproj/MGSPrefsEditorProperties.xib
+7 −11 en.lproj/SMLDetab.xib
+7 −8 en.lproj/SMLEntab.xib
+10 −10 en.lproj/SMLGoToLine.xib

0 comments on commit bc25992

Please sign in to comment.