diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..c924040 Binary files /dev/null and b/.DS_Store differ diff --git a/Croc.xcodeproj/project.pbxproj b/Croc.xcodeproj/project.pbxproj index 370aef0..1047a01 100644 --- a/Croc.xcodeproj/project.pbxproj +++ b/Croc.xcodeproj/project.pbxproj @@ -612,7 +612,7 @@ PRODUCT_NAME = Croc; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -635,7 +635,7 @@ PRODUCT_NAME = Croc; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -653,7 +653,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -671,7 +671,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -694,7 +694,7 @@ PRODUCT_NAME = Croc; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -718,7 +718,7 @@ PRODUCT_NAME = Croc; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -741,7 +741,7 @@ PRODUCT_NAME = Croc; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -764,7 +764,7 @@ PRODUCT_NAME = Croc; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -783,7 +783,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 11.2; }; @@ -802,7 +802,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 11.2; }; @@ -829,7 +829,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -854,7 +854,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -873,7 +873,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -892,7 +892,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -954,7 +954,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1012,7 +1012,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; diff --git a/Example/Source/AppDelegate.swift b/Example/Source/AppDelegate.swift index 1c93c5d..0adf153 100644 --- a/Example/Source/AppDelegate.swift +++ b/Example/Source/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/Example/iOS Example.xcodeproj/project.pbxproj b/Example/iOS Example.xcodeproj/project.pbxproj index 2015f1f..9b3f13c 100644 --- a/Example/iOS Example.xcodeproj/project.pbxproj +++ b/Example/iOS Example.xcodeproj/project.pbxproj @@ -402,7 +402,7 @@ ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.jkalash.CrocExample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -416,7 +416,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jkalash.CrocExample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Source/Character+Unicode.swift b/Source/Character+Unicode.swift index 77a4420..2be7d51 100644 --- a/Source/Character+Unicode.swift +++ b/Source/Character+Unicode.swift @@ -54,7 +54,7 @@ public extension Character { /// - Parameter char: a Character. Note: Only render first code point to prevent /// - Returns: a Portable Network Graphic (png), as Data optional func png(ofSize fontSize: CGFloat) -> Data? { - let attributes = [NSAttributedStringKey.font: UIFont.systemFont(ofSize: fontSize)] + let attributes = [NSAttributedString.Key.font: UIFont.systemFont(ofSize: fontSize)] let charStr = "\(self)" as NSString let size = charStr.size(withAttributes: attributes) @@ -63,7 +63,7 @@ public extension Character { var png:Data? = nil if let charImage = UIGraphicsGetImageFromCurrentImageContext() { - png = UIImagePNGRepresentation(charImage) + png = charImage.pngData() } UIGraphicsEndImageContext() diff --git a/py/.DS_Store b/py/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/py/.DS_Store differ diff --git a/py/emoji-test.txt b/py/emojis.txt similarity index 100% rename from py/emoji-test.txt rename to py/emojis.txt diff --git a/py/parse.py b/py/parse.py index 8685e64..a82dc54 100644 --- a/py/parse.py +++ b/py/parse.py @@ -3,7 +3,7 @@ import json def strip_emojis(line): - PERMITTED_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-: " + PERMITTED_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-: " return "".join(c for c in line if c in PERMITTED_CHARS) @@ -12,7 +12,7 @@ def chomp(x): if x.endswith("\n"): return x[:-1] return x -lines = list(open("emoji-test.txt")) +lines = list(open("emojis.txt")) emojis = dict() group_name = "" @@ -28,7 +28,7 @@ def chomp(x): elif line.startswith("Subgroup: "): subgroup_name = chomp(line.replace("Subgroup: ", "")) emojis[group_name][subgroup_name] = list() - #3. + #3. else: #Lines containing _DISCARD_ should be discarded.. if "_DISCARD_" in line: @@ -45,4 +45,4 @@ def chomp(x): #Write emojis to JSON file with open('emojis.json', 'w') as fp: - json.dump(emojis, fp) \ No newline at end of file + json.dump(emojis, fp)