Skip to content

Commit 13de2b6

Browse files
author
Phil Toland
authored
Merge pull request #90 from tattali/fix-deprecation-with-catalina
fix deprecation with catalina
2 parents 7b11f25 + 0abe55b commit 13de2b6

File tree

3 files changed

+57
-5
lines changed

3 files changed

+57
-5
lines changed

‎QLMarkdown.xcodeproj/project.pbxproj

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
/* End PBXBuildFile section */
4444

4545
/* Begin PBXFileReference section */
46-
089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
4746
08FB77B6FE84183AC02AAC07 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
4847
0A80BFA40E21A2E200C8BF14 /* markdown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markdown.h; sourceTree = "<group>"; };
4948
0A80BFA60E21A2ED00C8BF14 /* markdown.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = markdown.m; sourceTree = "<group>"; };
5049
0A80BFB10E21A90900C8BF14 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
5150
0A80BFCB0E21B61A00C8BF14 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
5251
0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
52+
0C7E83A7235E288A00CB111B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
5353
2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratePreviewForURL.m; sourceTree = "<group>"; };
5454
4446CFF20F41899C00BAC3F4 /* discount-wrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "discount-wrapper.c"; sourceTree = "<group>"; };
5555
4446CFF30F41899C00BAC3F4 /* discount-wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "discount-wrapper.h"; sourceTree = "<group>"; };
@@ -234,14 +234,15 @@
234234
089C1669FE841209C02AAC07 /* Project object */ = {
235235
isa = PBXProject;
236236
attributes = {
237-
LastUpgradeCheck = 0700;
237+
LastUpgradeCheck = 1110;
238238
};
239239
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QLMarkdown" */;
240240
compatibilityVersion = "Xcode 3.2";
241-
developmentRegion = English;
241+
developmentRegion = en;
242242
hasScannedForEncodings = 1;
243243
knownRegions = (
244244
en,
245+
Base,
245246
);
246247
mainGroup = 089C166AFE841209C02AAC07 /* QLMarkdown */;
247248
projectDirPath = "";
@@ -290,7 +291,7 @@
290291
);
291292
runOnlyForDeploymentPostprocessing = 0;
292293
shellPath = "/bin/sh $(SRCROOT)/discount-config/update.sh";
293-
shellScript = "";
294+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n";
294295
};
295296
/* End PBXShellScriptBuildPhase section */
296297

@@ -323,7 +324,7 @@
323324
8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
324325
isa = PBXVariantGroup;
325326
children = (
326-
089C167EFE841241C02AAC07 /* English */,
327+
0C7E83A7235E288A00CB111B /* en */,
327328
);
328329
name = InfoPlist.strings;
329330
sourceTree = "<group>";
@@ -367,14 +368,36 @@
367368
2CA326230896AD4900168862 /* Debug */ = {
368369
isa = XCBuildConfiguration;
369370
buildSettings = {
371+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
372+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
373+
CLANG_WARN_BOOL_CONVERSION = YES;
374+
CLANG_WARN_COMMA = YES;
375+
CLANG_WARN_CONSTANT_CONVERSION = YES;
376+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
370377
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
378+
CLANG_WARN_EMPTY_BODY = YES;
379+
CLANG_WARN_ENUM_CONVERSION = YES;
380+
CLANG_WARN_INFINITE_RECURSION = YES;
381+
CLANG_WARN_INT_CONVERSION = YES;
382+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
383+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
384+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
371385
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
386+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
387+
CLANG_WARN_STRICT_PROTOTYPES = YES;
388+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
389+
CLANG_WARN_UNREACHABLE_CODE = YES;
372390
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
373391
DEBUG_INFORMATION_FORMAT = dwarf;
392+
ENABLE_STRICT_OBJC_MSGSEND = YES;
374393
ENABLE_TESTABILITY = YES;
394+
GCC_NO_COMMON_BLOCKS = YES;
375395
GCC_OPTIMIZATION_LEVEL = 0;
396+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
376397
GCC_WARN_ABOUT_RETURN_TYPE = YES;
377398
GCC_WARN_UNDECLARED_SELECTOR = YES;
399+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
400+
GCC_WARN_UNUSED_FUNCTION = YES;
378401
GCC_WARN_UNUSED_VARIABLE = YES;
379402
MACOSX_DEPLOYMENT_TARGET = 10.6;
380403
ONLY_ACTIVE_ARCH = YES;
@@ -387,12 +410,34 @@
387410
2CA326240896AD4900168862 /* Release */ = {
388411
isa = XCBuildConfiguration;
389412
buildSettings = {
413+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
414+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
415+
CLANG_WARN_BOOL_CONVERSION = YES;
416+
CLANG_WARN_COMMA = YES;
417+
CLANG_WARN_CONSTANT_CONVERSION = YES;
418+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
390419
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
420+
CLANG_WARN_EMPTY_BODY = YES;
421+
CLANG_WARN_ENUM_CONVERSION = YES;
422+
CLANG_WARN_INFINITE_RECURSION = YES;
423+
CLANG_WARN_INT_CONVERSION = YES;
424+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
425+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
426+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
391427
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
428+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
429+
CLANG_WARN_STRICT_PROTOTYPES = YES;
430+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
431+
CLANG_WARN_UNREACHABLE_CODE = YES;
392432
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
393433
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
434+
ENABLE_STRICT_OBJC_MSGSEND = YES;
435+
GCC_NO_COMMON_BLOCKS = YES;
436+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
394437
GCC_WARN_ABOUT_RETURN_TYPE = YES;
395438
GCC_WARN_UNDECLARED_SELECTOR = YES;
439+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
440+
GCC_WARN_UNUSED_FUNCTION = YES;
396441
GCC_WARN_UNUSED_VARIABLE = YES;
397442
MACOSX_DEPLOYMENT_TARGET = 10.6;
398443
SDKROOT = macosx;

‎discount-config/update.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,10 @@ status_msg "Clean files from working directory..."
5656
git clean -f -d
5757

5858
status_msg "Done!"
59+
60+
PRODUCT="${PRODUCT_NAME}.qlgenerator"
61+
QL_PATH=~/Library/QuickLook/
62+
63+
rm -rf "$QL_PATH/$PRODUCT"
64+
test -d "$QL_PATH" || mkdir -p "$QL_PATH" && cp -R "$BUILT_PRODUCTS_DIR/$PRODUCT" "$QL_PATH"
65+
qlmanage -r

‎English.lproj/InfoPlist.strings renamed to ‎en.lproj/InfoPlist.strings

File renamed without changes.

0 commit comments

Comments
 (0)