Update dependencies. Bump to v1.4.4

taggon · Oct 19, 2018 · 7aba7d3 · 7aba7d3
1 parent 9dc36f3
commit 7aba7d3
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 27 deletions.
diff --git a/Highlight.xcodeproj/project.pbxproj b/Highlight.xcodeproj/project.pbxproj
@@ -195,13 +195,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Taegon Kim";
 				TargetAttributes = {
 					F25AEB6E1E212C6E0083CB52 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = PJ627876A5;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -256,15 +256,13 @@
 				"${BUILT_PRODUCTS_DIR}/LetsMove/LetsMove.framework",
 				"${BUILT_PRODUCTS_DIR}/Magnet/Magnet.framework",
 				"${PODS_ROOT}/Sparkle/Sparkle.framework",
-				"${PODS_ROOT}/Sparkle/Sparkle.framework.dSYM",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeyHolder.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LetsMove.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Magnet.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework",
-				"${DWARF_DSYM_FOLDER_PATH}/Sparkle.framework.dSYM",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -379,13 +377,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -435,13 +435,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -478,11 +480,10 @@
 				DEVELOPMENT_TEAM = PJ627876A5;
 				INFOPLIST_FILE = Highlight/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = kim.taegon.Highlight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -495,11 +496,10 @@
 				DEVELOPMENT_TEAM = PJ627876A5;
 				INFOPLIST_FILE = Highlight/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = kim.taegon.Highlight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Highlight.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Highlight.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Highlight.xcodeproj/xcuserdata/taggon.xcuserdatad/xcschemes/Highlight.xcscheme b/Highlight.xcodeproj/xcuserdata/taggon.xcuserdatad/xcschemes/Highlight.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Highlight.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Highlight.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Highlight/AppDelegate.swift b/Highlight/AppDelegate.swift
@@ -23,7 +23,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UserSettings {
     var currentFont: NSFont?
 
     lazy var prefWindowController: NSWindowController! = {
-        let storyboard = NSStoryboard(name: NSStoryboard.Name(rawValue: "Preferences"), bundle: Bundle.main)
+        let storyboard = NSStoryboard(name: "Preferences", bundle: Bundle.main)
         let controller = storyboard.instantiateInitialController() as! PrefWindowController
 
         return controller
@@ -155,7 +155,7 @@ extension AppDelegate {
 
     func loadStatusImage(name: String) {
         if let button = statusItem.button {
-            button.image = NSImage(named: NSImage.Name(rawValue: name))
+            button.image = NSImage(named: name)
             button.image!.size = NSMakeSize(18.0, 18.0)
         }
     }

diff --git a/Highlight/Constant.swift b/Highlight/Constant.swift
@@ -6,7 +6,7 @@
 // DO NOT MODIFY THIS FILE MANUALLY
 //
 
-public let hlLangCount: UInt16 = 176
+public let hlLangCount: UInt16 = 185
 
 public let hlLanguages:[String: String] = [
 	"Apache": "apache",
@@ -18,7 +18,7 @@ public let hlLanguages:[String: String] = [
 	"Diff": "diff",
 	"HTML, XML": "xml",
 	"HTTP": "http",
-	"Ini": "ini",
+	"Ini, TOML": "ini",
 	"JSON": "json",
 	"Java": "java",
 	"JavaScript": "javascript",
@@ -28,6 +28,7 @@ public let hlLanguages:[String: String] = [
 	"Objective-C": "objectivec",
 	"PHP": "php",
 	"Perl": "perl",
+	"Properties": "properties",
 	"Python": "python",
 	"Ruby": "ruby",
 	"SQL": "sql",
@@ -38,7 +39,9 @@ public let hlLanguages:[String: String] = [
 	"Access log": "accesslog",
 	"ActionScript": "actionscript",
 	"Ada": "ada",
+	"AngelScript": "angelscript",
 	"AppleScript": "applescript",
+	"ArcGIS Arcade": "arcade",
 	"Arduino": "arduino",
 	"AsciiDoc": "asciidoc",
 	"AspectJ": "aspectj",
@@ -85,6 +88,7 @@ public let hlLanguages:[String: String] = [
 	"GAMS": "gams",
 	"GAUSS": "gauss",
 	"GLSL": "glsl",
+	"GML": "gml",
 	"Gherkin": "gherkin",
 	"Go": "go",
 	"Golo": "golo",
@@ -98,6 +102,7 @@ public let hlLanguages:[String: String] = [
 	"Haxe": "haxe",
 	"Hy": "hy",
 	"IRPF90": "irpf90",
+	"ISBL": "isbl",
 	"Inform 7": "inform7",
 	"Intel x86 Assembly": "x86asm",
 	"Julia": "julia",
@@ -134,6 +139,7 @@ public let hlLanguages:[String: String] = [
 	"Oxygene": "oxygene",
 	"Parser3": "parser3",
 	"Pony": "pony",
+	"PostgreSQL SQL dialect and PL/pgSQL": "pgsql",
 	"PowerShell": "powershell",
 	"Processing": "processing",
 	"Prolog": "prolog",
@@ -144,10 +150,12 @@ public let hlLanguages:[String: String] = [
 	"Q": "q",
 	"QML": "qml",
 	"R": "r",
+	"ReasonML": "reasonml",
 	"RenderMan RIB": "rib",
 	"RenderMan RSL": "rsl",
 	"Roboconf": "roboconf",
 	"Rust": "rust",
+	"SAS": "sas",
 	"SCSS": "scss",
 	"SML": "sml",
 	"SQF": "sqf",
@@ -185,10 +193,14 @@ public let hlLanguages:[String: String] = [
 	"dsconfig": "dsconfig",
 	"jboss-cli": "jboss-cli",
 	"pf": "pf",
+	"plaintext": "plaintext",
 ]
 
 public let hlStyles:[String: String] = [
+	"A11y Dark": "a11y-dark",
+	"A11y Light": "a11y-light",
 	"Agate": "agate",
+	"An Old Hope": "an-old-hope",
 	"Android Studio": "androidstudio",
 	"Arduino Light": "arduino-light",
 	"Arta": "arta",
@@ -213,6 +225,7 @@ public let hlStyles:[String: String] = [
 	"Atelier Seaside Light": "atelier-seaside-light",
 	"Atelier Sulphurpool Dark": "atelier-sulphurpool-dark",
 	"Atelier Sulphurpool Light": "atelier-sulphurpool-light",
+	"Atom One Dark Reasonable": "atom-one-dark-reasonable",
 	"Atom One Dark": "atom-one-dark",
 	"Atom One Light": "atom-one-light",
 	"Brown Paper": "brown-paper",
@@ -228,6 +241,7 @@ public let hlStyles:[String: String] = [
 	"Foundation": "foundation",
 	"Github Gist": "github-gist",
 	"Github": "github",
+	"Gml": "gml",
 	"Google Code": "googlecode",
 	"Grayscale": "grayscale",
 	"Gruvbox Dark": "gruvbox-dark",
@@ -236,12 +250,16 @@ public let hlStyles:[String: String] = [
 	"Hybrid": "hybrid",
 	"Intellij IDEA": "idea",
 	"IR Black": "ir-black",
+	"Isbl Editor Dark": "isbl-editor-dark",
+	"Isbl Editor Light": "isbl-editor-light",
 	"Kimbie Dark": "kimbie.dark",
 	"Kimbie Light": "kimbie.light",
+	"Lightfair": "lightfair",
 	"Magula": "magula",
 	"Mono Blue": "mono-blue",
 	"Monokai Sublime": "monokai-sublime",
 	"Monokai": "monokai",
+	"Nord": "nord",
 	"Obsidian": "obsidian",
 	"Ocean": "ocean",
 	"Paraiso Dark": "paraiso-dark",
@@ -254,6 +272,7 @@ public let hlStyles:[String: String] = [
 	"Rainbow": "rainbow",
 	"RouterOS": "routeros",
 	"School Book": "school-book",
+	"Shades Of Purple": "shades-of-purple",
 	"Solarized Dark": "solarized-dark",
 	"Solarized Light": "solarized-light",
 	"Sunburst": "sunburst",

diff --git a/Highlight/Highlighter.swift b/Highlight/Highlighter.swift
@@ -86,7 +86,7 @@ class Highlighter: UserSettings {
         attrStr = NSMutableAttributedString(html: html.data(using: .unicode)!, options: [:], documentAttributes: nil)!
 
         // set the default font size
-        attrStr.addAttribute(NSAttributedStringKey.font, value: userFont ?? defaultFont, range: NSMakeRange(0, attrStr.length))
+        attrStr.addAttribute(NSAttributedString.Key.font, value: userFont ?? defaultFont, range: NSMakeRange(0, attrStr.length))
 
         return attrStr
     }

diff --git a/Highlight/Info.plist b/Highlight/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.3</string>
+	<string>1.4.4</string>
 	<key>CFBundleVersion</key>
-	<string>171223.1</string>
+	<string>181019.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - KeyHolder (2.1.0):
-    - Magnet (~> 2.1)
+  - KeyHolder (3.0.1):
+    - Magnet (~> 2.3)
   - LetsMove (1.24)
-  - Magnet (2.1.0)
-  - Sparkle (1.18.1)
+  - Magnet (2.3.0)
+  - Sparkle (1.20.0)
 
 DEPENDENCIES:
   - KeyHolder
@@ -12,10 +12,10 @@ DEPENDENCIES:
   - Sparkle
 
 SPEC CHECKSUMS:
-  KeyHolder: 22fc9d2c939bf5a24078d0bbb2a354d9da1386e3
+  KeyHolder: 142932db4eac7420b003e2eae94c9a61b8b53cb1
   LetsMove: fefe56bc7bc7fb7d37049e28a14f297961229fc5
-  Magnet: 6c26f03a279b9340bb6a86a73a1314d2da110219
-  Sparkle: 06ea33170007c5937ee54da481b4481af98fac79
+  Magnet: 85344b019d023e26062199aeb5b4ad1f8d41c5df
+  Sparkle: 48999e7ee032f05ca05e28451eadf4af8ede6b44
 
 PODFILE CHECKSUM: 68bc0dfd1ee7ebc780c9df40923ddb9e768b6b31