Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update other dependency libraries (#422)
* Update other dependency libraries * swiftlint * Modify SwiftGen recommend settings
- Loading branch information
Showing
385 changed files
with
24,347 additions
and
13,152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,161 +1,110 @@ | ||
| // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen | ||
| // swiftlint:disable all | ||
| // Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen | ||
|
|
||
| #if os(OSX) | ||
| import AppKit.NSImage | ||
| internal typealias AssetColorTypeAlias = NSColor | ||
| internal typealias Image = NSImage | ||
| #elseif os(iOS) || os(tvOS) || os(watchOS) | ||
| import UIKit.UIImage | ||
| internal typealias AssetColorTypeAlias = UIColor | ||
| internal typealias Image = UIImage | ||
| #if os(macOS) | ||
| import AppKit | ||
| #elseif os(iOS) | ||
| import UIKit | ||
| #elseif os(tvOS) || os(watchOS) | ||
| import UIKit | ||
| #endif | ||
|
|
||
| // swiftlint:disable superfluous_disable_command | ||
| // swiftlint:disable file_length | ||
| // Deprecated typealiases | ||
| @available(*, deprecated, renamed: "ImageAsset.Image", message: "This typealias will be removed in SwiftGen 7.0") | ||
| internal typealias AssetImageTypeAlias = ImageAsset.Image | ||
|
|
||
| // swiftlint:disable superfluous_disable_command file_length implicit_return | ||
|
|
||
| // MARK: - Asset Catalogs | ||
|
|
||
| // swiftlint:disable identifier_name line_length nesting type_body_length type_name | ||
| internal enum Asset { | ||
| internal static let iconFolder = ImageAsset(name: "icon_folder") | ||
| internal static let iconText = ImageAsset(name: "icon_text") | ||
| internal static let prefBeta = ImageAsset(name: "pref_beta") | ||
| internal static let prefBetaOn = ImageAsset(name: "pref_beta_on") | ||
| internal static let prefExcluded = ImageAsset(name: "pref_excluded") | ||
| internal static let prefExcludedOn = ImageAsset(name: "pref_excluded_on") | ||
| internal static let prefGeneral = ImageAsset(name: "pref_general") | ||
| internal static let prefGeneralOn = ImageAsset(name: "pref_general_on") | ||
| internal static let prefMenu = ImageAsset(name: "pref_menu") | ||
| internal static let prefMenuOn = ImageAsset(name: "pref_menu_on") | ||
| internal static let prefShortcut = ImageAsset(name: "pref_shortcut") | ||
| internal static let prefShortcutOn = ImageAsset(name: "pref_shortcut_on") | ||
| internal static let prefType = ImageAsset(name: "pref_type") | ||
| internal static let prefTypeOn = ImageAsset(name: "pref_type_on") | ||
| internal static let prefUpdate = ImageAsset(name: "pref_update") | ||
| internal static let prefUpdateOn = ImageAsset(name: "pref_update_on") | ||
| internal static let snippetsAddFolder = ImageAsset(name: "snippets_add_folder") | ||
| internal static let snippetsAddFolderOn = ImageAsset(name: "snippets_add_folder_on") | ||
| internal static let snippetsAddSnippet = ImageAsset(name: "snippets_add_snippet") | ||
| internal static let snippetsAddSnippetOn = ImageAsset(name: "snippets_add_snippet_on") | ||
| internal static let snippetsDeleteSnippet = ImageAsset(name: "snippets_delete_snippet") | ||
| internal static let snippetsDeleteSnippetOn = ImageAsset(name: "snippets_delete_snippet_on") | ||
| internal static let snippetsEnableSnippet = ImageAsset(name: "snippets_enable_snippet") | ||
| internal static let snippetsEnableSnippetOn = ImageAsset(name: "snippets_enable_snippet_on") | ||
| internal static let snippetsExport = ImageAsset(name: "snippets_export") | ||
| internal static let snippetsExportOn = ImageAsset(name: "snippets_export_on") | ||
| internal static let snippetsIconFolderBlue = ImageAsset(name: "snippets_icon_folder_blue") | ||
| internal static let snippetsIconFolderWhite = ImageAsset(name: "snippets_icon_folder_white") | ||
| internal static let snippetsImport = ImageAsset(name: "snippets_import") | ||
| internal static let snippetsImportOn = ImageAsset(name: "snippets_import_on") | ||
| internal static let statusbarMenuBlack = ImageAsset(name: "statusbar_menu_black") | ||
| internal static let statusbarMenuWhite = ImageAsset(name: "statusbar_menu_white") | ||
| } | ||
| // swiftlint:enable identifier_name line_length nesting type_body_length type_name | ||
|
|
||
| @available(*, deprecated, renamed: "ImageAsset") | ||
| internal typealias AssetType = ImageAsset | ||
| // MARK: - Implementation Details | ||
|
|
||
| internal struct ImageAsset { | ||
| internal fileprivate(set) var name: String | ||
|
|
||
| #if os(macOS) | ||
| internal typealias Image = NSImage | ||
| #elseif os(iOS) || os(tvOS) || os(watchOS) | ||
| internal typealias Image = UIImage | ||
| #endif | ||
|
|
||
| internal var image: Image { | ||
| let bundle = Bundle(for: BundleToken.self) | ||
| let bundle = BundleToken.bundle | ||
| #if os(iOS) || os(tvOS) | ||
| let image = Image(named: name, in: bundle, compatibleWith: nil) | ||
| #elseif os(OSX) | ||
| let image = bundle.image(forResource: NSImage.Name(name)) | ||
| #elseif os(macOS) | ||
| let name = NSImage.Name(self.name) | ||
| let image = (bundle == .main) ? NSImage(named: name) : bundle.image(forResource: name) | ||
| #elseif os(watchOS) | ||
| let image = Image(named: name) | ||
| #endif | ||
| guard let result = image else { fatalError("Unable to load image named \(name).") } | ||
| guard let result = image else { | ||
| fatalError("Unable to load image named \(name).") | ||
| } | ||
| return result | ||
| } | ||
| } | ||
|
|
||
| internal struct ColorAsset { | ||
| internal fileprivate(set) var name: String | ||
|
|
||
| @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *) | ||
| internal var color: AssetColorTypeAlias { | ||
| return AssetColorTypeAlias(asset: self) | ||
| } | ||
| } | ||
|
|
||
| // swiftlint:disable identifier_name line_length nesting type_body_length type_name | ||
| internal enum Asset { | ||
| internal enum Common { | ||
| internal static let iconFolder = ImageAsset(name: "icon_folder") | ||
| internal static let iconText = ImageAsset(name: "icon_text") | ||
| } | ||
| internal enum Preference { | ||
| internal static let prefBeta = ImageAsset(name: "pref_beta") | ||
| internal static let prefBetaOn = ImageAsset(name: "pref_beta_on") | ||
| internal static let prefExcluded = ImageAsset(name: "pref_excluded") | ||
| internal static let prefExcludedOn = ImageAsset(name: "pref_excluded_on") | ||
| internal static let prefGeneral = ImageAsset(name: "pref_general") | ||
| internal static let prefGeneralOn = ImageAsset(name: "pref_general_on") | ||
| internal static let prefMenu = ImageAsset(name: "pref_menu") | ||
| internal static let prefMenuOn = ImageAsset(name: "pref_menu_on") | ||
| internal static let prefShortcut = ImageAsset(name: "pref_shortcut") | ||
| internal static let prefShortcutOn = ImageAsset(name: "pref_shortcut_on") | ||
| internal static let prefType = ImageAsset(name: "pref_type") | ||
| internal static let prefTypeOn = ImageAsset(name: "pref_type_on") | ||
| internal static let prefUpdate = ImageAsset(name: "pref_update") | ||
| internal static let prefUpdateOn = ImageAsset(name: "pref_update_on") | ||
| } | ||
| internal enum SnippetEditor { | ||
| internal static let snippetsAddFolder = ImageAsset(name: "snippets_add_folder") | ||
| internal static let snippetsAddFolderOn = ImageAsset(name: "snippets_add_folder_on") | ||
| internal static let snippetsAddSnippet = ImageAsset(name: "snippets_add_snippet") | ||
| internal static let snippetsAddSnippetOn = ImageAsset(name: "snippets_add_snippet_on") | ||
| internal static let snippetsDeleteSnippet = ImageAsset(name: "snippets_delete_snippet") | ||
| internal static let snippetsDeleteSnippetOn = ImageAsset(name: "snippets_delete_snippet_on") | ||
| internal static let snippetsEnableSnippet = ImageAsset(name: "snippets_enable_snippet") | ||
| internal static let snippetsEnableSnippetOn = ImageAsset(name: "snippets_enable_snippet_on") | ||
| internal static let snippetsExport = ImageAsset(name: "snippets_export") | ||
| internal static let snippetsExportOn = ImageAsset(name: "snippets_export_on") | ||
| internal static let snippetsIconFolderBlue = ImageAsset(name: "snippets_icon_folder_blue") | ||
| internal static let snippetsIconFolderWhite = ImageAsset(name: "snippets_icon_folder_white") | ||
| internal static let snippetsImport = ImageAsset(name: "snippets_import") | ||
| internal static let snippetsImportOn = ImageAsset(name: "snippets_import_on") | ||
| } | ||
| internal enum StatusIcon { | ||
| internal static let statusbarMenuBlack = ImageAsset(name: "statusbar_menu_black") | ||
| internal static let statusbarMenuWhite = ImageAsset(name: "statusbar_menu_white") | ||
| } | ||
|
|
||
| // swiftlint:disable trailing_comma | ||
| internal static let allColors: [ColorAsset] = [ | ||
| ] | ||
| internal static let allImages: [ImageAsset] = [ | ||
| Common.iconFolder, | ||
| Common.iconText, | ||
| Preference.prefBeta, | ||
| Preference.prefBetaOn, | ||
| Preference.prefExcluded, | ||
| Preference.prefExcludedOn, | ||
| Preference.prefGeneral, | ||
| Preference.prefGeneralOn, | ||
| Preference.prefMenu, | ||
| Preference.prefMenuOn, | ||
| Preference.prefShortcut, | ||
| Preference.prefShortcutOn, | ||
| Preference.prefType, | ||
| Preference.prefTypeOn, | ||
| Preference.prefUpdate, | ||
| Preference.prefUpdateOn, | ||
| SnippetEditor.snippetsAddFolder, | ||
| SnippetEditor.snippetsAddFolderOn, | ||
| SnippetEditor.snippetsAddSnippet, | ||
| SnippetEditor.snippetsAddSnippetOn, | ||
| SnippetEditor.snippetsDeleteSnippet, | ||
| SnippetEditor.snippetsDeleteSnippetOn, | ||
| SnippetEditor.snippetsEnableSnippet, | ||
| SnippetEditor.snippetsEnableSnippetOn, | ||
| SnippetEditor.snippetsExport, | ||
| SnippetEditor.snippetsExportOn, | ||
| SnippetEditor.snippetsIconFolderBlue, | ||
| SnippetEditor.snippetsIconFolderWhite, | ||
| SnippetEditor.snippetsImport, | ||
| SnippetEditor.snippetsImportOn, | ||
| StatusIcon.statusbarMenuBlack, | ||
| StatusIcon.statusbarMenuWhite, | ||
| ] | ||
| // swiftlint:enable trailing_comma | ||
| @available(*, deprecated, renamed: "allImages") | ||
| internal static let allValues: [AssetType] = allImages | ||
| } | ||
| // swiftlint:enable identifier_name line_length nesting type_body_length type_name | ||
|
|
||
| internal extension Image { | ||
| @available(iOS 1.0, tvOS 1.0, watchOS 1.0, *) | ||
| @available(OSX, deprecated, | ||
| internal extension ImageAsset.Image { | ||
| @available(macOS, deprecated, | ||
| message: "This initializer is unsafe on macOS, please use the ImageAsset.image property") | ||
| convenience init!(asset: ImageAsset) { | ||
| #if os(iOS) || os(tvOS) | ||
| let bundle = Bundle(for: BundleToken.self) | ||
| let bundle = BundleToken.bundle | ||
| self.init(named: asset.name, in: bundle, compatibleWith: nil) | ||
| #elseif os(OSX) | ||
| #elseif os(macOS) | ||
| self.init(named: NSImage.Name(asset.name)) | ||
| #elseif os(watchOS) | ||
| self.init(named: asset.name) | ||
| #endif | ||
| } | ||
| } | ||
|
|
||
| internal extension AssetColorTypeAlias { | ||
| @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *) | ||
| convenience init!(asset: ColorAsset) { | ||
| let bundle = Bundle(for: BundleToken.self) | ||
| #if os(iOS) || os(tvOS) | ||
| self.init(named: asset.name, in: bundle, compatibleWith: nil) | ||
| #elseif os(OSX) | ||
| self.init(named: NSColor.Name(asset.name), bundle: bundle) | ||
| #elseif os(watchOS) | ||
| self.init(named: asset.name) | ||
| // swiftlint:disable convenience_type | ||
| private final class BundleToken { | ||
| static let bundle: Bundle = { | ||
| #if SWIFT_PACKAGE | ||
| return Bundle.module | ||
| #else | ||
| return Bundle(for: BundleToken.self) | ||
| #endif | ||
| } | ||
| }() | ||
| } | ||
|
|
||
| private final class BundleToken {} | ||
| // swiftlint:enable convenience_type |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.