Skip to content

Commit 95704ef

Browse files
Econa77Econa77
authored
Update other dependency libraries (Clipy#422)
* Update other dependency libraries * swiftlint * Modify SwiftGen recommend settings
1 parent 3697b33 commit 95704ef

File tree

385 files changed

+24347
-13152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+24347
-13152
lines changed

‎Clipy.xcodeproj/project.pbxproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
FA6167921D3ABEB10049FA14 /* FolderSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6167911D3ABEB10049FA14 /* FolderSpec.swift */; };
6868
FA6167941D3ACCB90049FA14 /* DraggedDataSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6167931D3ACCB90049FA14 /* DraggedDataSpec.swift */; };
6969
FA6167961D3ACDD80049FA14 /* SnippetSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6167951D3ACDD80049FA14 /* SnippetSpec.swift */; };
70-
FA6DD5141C7DEDB600317E73 /* (null) in Resources */ = {isa = PBXBuildFile; };
71-
FA6DD5151C7DEDB600317E73 /* (null) in Resources */ = {isa = PBXBuildFile; };
70+
FA6DD5141C7DEDB600317E73 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
71+
FA6DD5151C7DEDB600317E73 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
7272
FAA4BCCC2163DC9100FF5D18 /* AccessibilityService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAA4BCCB2163DC9100FF5D18 /* AccessibilityService.swift */; };
7373
FAC0DCE91DE15FD900309C49 /* DataCleanService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC0DCE81DE15FD900309C49 /* DataCleanService.swift */; };
7474
FAC0DCEF1DE3255E00309C49 /* NSImage+NSColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC0DCEE1DE3255E00309C49 /* NSImage+NSColor.swift */; };
@@ -648,7 +648,7 @@
648648
buildActionMask = 2147483647;
649649
files = (
650650
FA1DB5131DDCB4C0007F95C8 /* CPYPreferencesWindowController.xib in Resources */,
651-
FA6DD5141C7DEDB600317E73 /* (null) in Resources */,
651+
FA6DD5141C7DEDB600317E73 /* BuildFile in Resources */,
652652
FA1DB51E1DDCB4C0007F95C8 /* CPYTypePreferenceViewController.xib in Resources */,
653653
FA1DB4901DDCA5D9007F95C8 /* Images.xcassets in Resources */,
654654
FA1DB51D1DDCB4C0007F95C8 /* CPYShortcutsPreferenceViewController.xib in Resources */,
@@ -657,7 +657,7 @@
657657
FA1DB51B1DDCB4C0007F95C8 /* CPYGeneralPreferenceViewController.xib in Resources */,
658658
FA1DB51A1DDCB4C0007F95C8 /* CPYExcludeAppPreferenceViewController.xib in Resources */,
659659
FA1DB5191DDCB4C0007F95C8 /* CPYBetaPreferenceViewController.xib in Resources */,
660-
FA6DD5151C7DEDB600317E73 /* (null) in Resources */,
660+
FA6DD5151C7DEDB600317E73 /* BuildFile in Resources */,
661661
FA1DB4941DDCB22C007F95C8 /* dsa_pub.pem in Resources */,
662662
FA1DB4981DDCB2CB007F95C8 /* Localizable.strings in Resources */,
663663
FA1DB49F1DDCB417007F95C8 /* MainMenu.xib in Resources */,
@@ -688,6 +688,7 @@
688688
"${BUILT_PRODUCTS_DIR}/LoginServiceKit/LoginServiceKit.framework",
689689
"${BUILT_PRODUCTS_DIR}/Magnet/Magnet.framework",
690690
"${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework",
691+
"${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework",
691692
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
692693
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
693694
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
@@ -707,6 +708,7 @@
707708
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LoginServiceKit.framework",
708709
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Magnet.framework",
709710
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINCache.framework",
711+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework",
710712
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
711713
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
712714
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",

‎Clipy/Generated/AssetsImages.swift

+79-130
Original file line numberDiff line numberDiff line change
@@ -1,161 +1,110 @@
1-
// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
1+
// swiftlint:disable all
2+
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
23

3-
#if os(OSX)
4-
import AppKit.NSImage
5-
internal typealias AssetColorTypeAlias = NSColor
6-
internal typealias Image = NSImage
7-
#elseif os(iOS) || os(tvOS) || os(watchOS)
8-
import UIKit.UIImage
9-
internal typealias AssetColorTypeAlias = UIColor
10-
internal typealias Image = UIImage
4+
#if os(macOS)
5+
import AppKit
6+
#elseif os(iOS)
7+
import UIKit
8+
#elseif os(tvOS) || os(watchOS)
9+
import UIKit
1110
#endif
1211

13-
// swiftlint:disable superfluous_disable_command
14-
// swiftlint:disable file_length
12+
// Deprecated typealiases
13+
@available(*, deprecated, renamed: "ImageAsset.Image", message: "This typealias will be removed in SwiftGen 7.0")
14+
internal typealias AssetImageTypeAlias = ImageAsset.Image
15+
16+
// swiftlint:disable superfluous_disable_command file_length implicit_return
17+
18+
// MARK: - Asset Catalogs
19+
20+
// swiftlint:disable identifier_name line_length nesting type_body_length type_name
21+
internal enum Asset {
22+
internal static let iconFolder = ImageAsset(name: "icon_folder")
23+
internal static let iconText = ImageAsset(name: "icon_text")
24+
internal static let prefBeta = ImageAsset(name: "pref_beta")
25+
internal static let prefBetaOn = ImageAsset(name: "pref_beta_on")
26+
internal static let prefExcluded = ImageAsset(name: "pref_excluded")
27+
internal static let prefExcludedOn = ImageAsset(name: "pref_excluded_on")
28+
internal static let prefGeneral = ImageAsset(name: "pref_general")
29+
internal static let prefGeneralOn = ImageAsset(name: "pref_general_on")
30+
internal static let prefMenu = ImageAsset(name: "pref_menu")
31+
internal static let prefMenuOn = ImageAsset(name: "pref_menu_on")
32+
internal static let prefShortcut = ImageAsset(name: "pref_shortcut")
33+
internal static let prefShortcutOn = ImageAsset(name: "pref_shortcut_on")
34+
internal static let prefType = ImageAsset(name: "pref_type")
35+
internal static let prefTypeOn = ImageAsset(name: "pref_type_on")
36+
internal static let prefUpdate = ImageAsset(name: "pref_update")
37+
internal static let prefUpdateOn = ImageAsset(name: "pref_update_on")
38+
internal static let snippetsAddFolder = ImageAsset(name: "snippets_add_folder")
39+
internal static let snippetsAddFolderOn = ImageAsset(name: "snippets_add_folder_on")
40+
internal static let snippetsAddSnippet = ImageAsset(name: "snippets_add_snippet")
41+
internal static let snippetsAddSnippetOn = ImageAsset(name: "snippets_add_snippet_on")
42+
internal static let snippetsDeleteSnippet = ImageAsset(name: "snippets_delete_snippet")
43+
internal static let snippetsDeleteSnippetOn = ImageAsset(name: "snippets_delete_snippet_on")
44+
internal static let snippetsEnableSnippet = ImageAsset(name: "snippets_enable_snippet")
45+
internal static let snippetsEnableSnippetOn = ImageAsset(name: "snippets_enable_snippet_on")
46+
internal static let snippetsExport = ImageAsset(name: "snippets_export")
47+
internal static let snippetsExportOn = ImageAsset(name: "snippets_export_on")
48+
internal static let snippetsIconFolderBlue = ImageAsset(name: "snippets_icon_folder_blue")
49+
internal static let snippetsIconFolderWhite = ImageAsset(name: "snippets_icon_folder_white")
50+
internal static let snippetsImport = ImageAsset(name: "snippets_import")
51+
internal static let snippetsImportOn = ImageAsset(name: "snippets_import_on")
52+
internal static let statusbarMenuBlack = ImageAsset(name: "statusbar_menu_black")
53+
internal static let statusbarMenuWhite = ImageAsset(name: "statusbar_menu_white")
54+
}
55+
// swiftlint:enable identifier_name line_length nesting type_body_length type_name
1556

16-
@available(*, deprecated, renamed: "ImageAsset")
17-
internal typealias AssetType = ImageAsset
57+
// MARK: - Implementation Details
1858

1959
internal struct ImageAsset {
2060
internal fileprivate(set) var name: String
2161

62+
#if os(macOS)
63+
internal typealias Image = NSImage
64+
#elseif os(iOS) || os(tvOS) || os(watchOS)
65+
internal typealias Image = UIImage
66+
#endif
67+
2268
internal var image: Image {
23-
let bundle = Bundle(for: BundleToken.self)
69+
let bundle = BundleToken.bundle
2470
#if os(iOS) || os(tvOS)
2571
let image = Image(named: name, in: bundle, compatibleWith: nil)
26-
#elseif os(OSX)
27-
let image = bundle.image(forResource: NSImage.Name(name))
72+
#elseif os(macOS)
73+
let name = NSImage.Name(self.name)
74+
let image = (bundle == .main) ? NSImage(named: name) : bundle.image(forResource: name)
2875
#elseif os(watchOS)
2976
let image = Image(named: name)
3077
#endif
31-
guard let result = image else { fatalError("Unable to load image named \(name).") }
78+
guard let result = image else {
79+
fatalError("Unable to load image named \(name).")
80+
}
3281
return result
3382
}
3483
}
3584

36-
internal struct ColorAsset {
37-
internal fileprivate(set) var name: String
38-
39-
@available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
40-
internal var color: AssetColorTypeAlias {
41-
return AssetColorTypeAlias(asset: self)
42-
}
43-
}
44-
45-
// swiftlint:disable identifier_name line_length nesting type_body_length type_name
46-
internal enum Asset {
47-
internal enum Common {
48-
internal static let iconFolder = ImageAsset(name: "icon_folder")
49-
internal static let iconText = ImageAsset(name: "icon_text")
50-
}
51-
internal enum Preference {
52-
internal static let prefBeta = ImageAsset(name: "pref_beta")
53-
internal static let prefBetaOn = ImageAsset(name: "pref_beta_on")
54-
internal static let prefExcluded = ImageAsset(name: "pref_excluded")
55-
internal static let prefExcludedOn = ImageAsset(name: "pref_excluded_on")
56-
internal static let prefGeneral = ImageAsset(name: "pref_general")
57-
internal static let prefGeneralOn = ImageAsset(name: "pref_general_on")
58-
internal static let prefMenu = ImageAsset(name: "pref_menu")
59-
internal static let prefMenuOn = ImageAsset(name: "pref_menu_on")
60-
internal static let prefShortcut = ImageAsset(name: "pref_shortcut")
61-
internal static let prefShortcutOn = ImageAsset(name: "pref_shortcut_on")
62-
internal static let prefType = ImageAsset(name: "pref_type")
63-
internal static let prefTypeOn = ImageAsset(name: "pref_type_on")
64-
internal static let prefUpdate = ImageAsset(name: "pref_update")
65-
internal static let prefUpdateOn = ImageAsset(name: "pref_update_on")
66-
}
67-
internal enum SnippetEditor {
68-
internal static let snippetsAddFolder = ImageAsset(name: "snippets_add_folder")
69-
internal static let snippetsAddFolderOn = ImageAsset(name: "snippets_add_folder_on")
70-
internal static let snippetsAddSnippet = ImageAsset(name: "snippets_add_snippet")
71-
internal static let snippetsAddSnippetOn = ImageAsset(name: "snippets_add_snippet_on")
72-
internal static let snippetsDeleteSnippet = ImageAsset(name: "snippets_delete_snippet")
73-
internal static let snippetsDeleteSnippetOn = ImageAsset(name: "snippets_delete_snippet_on")
74-
internal static let snippetsEnableSnippet = ImageAsset(name: "snippets_enable_snippet")
75-
internal static let snippetsEnableSnippetOn = ImageAsset(name: "snippets_enable_snippet_on")
76-
internal static let snippetsExport = ImageAsset(name: "snippets_export")
77-
internal static let snippetsExportOn = ImageAsset(name: "snippets_export_on")
78-
internal static let snippetsIconFolderBlue = ImageAsset(name: "snippets_icon_folder_blue")
79-
internal static let snippetsIconFolderWhite = ImageAsset(name: "snippets_icon_folder_white")
80-
internal static let snippetsImport = ImageAsset(name: "snippets_import")
81-
internal static let snippetsImportOn = ImageAsset(name: "snippets_import_on")
82-
}
83-
internal enum StatusIcon {
84-
internal static let statusbarMenuBlack = ImageAsset(name: "statusbar_menu_black")
85-
internal static let statusbarMenuWhite = ImageAsset(name: "statusbar_menu_white")
86-
}
87-
88-
// swiftlint:disable trailing_comma
89-
internal static let allColors: [ColorAsset] = [
90-
]
91-
internal static let allImages: [ImageAsset] = [
92-
Common.iconFolder,
93-
Common.iconText,
94-
Preference.prefBeta,
95-
Preference.prefBetaOn,
96-
Preference.prefExcluded,
97-
Preference.prefExcludedOn,
98-
Preference.prefGeneral,
99-
Preference.prefGeneralOn,
100-
Preference.prefMenu,
101-
Preference.prefMenuOn,
102-
Preference.prefShortcut,
103-
Preference.prefShortcutOn,
104-
Preference.prefType,
105-
Preference.prefTypeOn,
106-
Preference.prefUpdate,
107-
Preference.prefUpdateOn,
108-
SnippetEditor.snippetsAddFolder,
109-
SnippetEditor.snippetsAddFolderOn,
110-
SnippetEditor.snippetsAddSnippet,
111-
SnippetEditor.snippetsAddSnippetOn,
112-
SnippetEditor.snippetsDeleteSnippet,
113-
SnippetEditor.snippetsDeleteSnippetOn,
114-
SnippetEditor.snippetsEnableSnippet,
115-
SnippetEditor.snippetsEnableSnippetOn,
116-
SnippetEditor.snippetsExport,
117-
SnippetEditor.snippetsExportOn,
118-
SnippetEditor.snippetsIconFolderBlue,
119-
SnippetEditor.snippetsIconFolderWhite,
120-
SnippetEditor.snippetsImport,
121-
SnippetEditor.snippetsImportOn,
122-
StatusIcon.statusbarMenuBlack,
123-
StatusIcon.statusbarMenuWhite,
124-
]
125-
// swiftlint:enable trailing_comma
126-
@available(*, deprecated, renamed: "allImages")
127-
internal static let allValues: [AssetType] = allImages
128-
}
129-
// swiftlint:enable identifier_name line_length nesting type_body_length type_name
130-
131-
internal extension Image {
132-
@available(iOS 1.0, tvOS 1.0, watchOS 1.0, *)
133-
@available(OSX, deprecated,
85+
internal extension ImageAsset.Image {
86+
@available(macOS, deprecated,
13487
message: "This initializer is unsafe on macOS, please use the ImageAsset.image property")
13588
convenience init!(asset: ImageAsset) {
13689
#if os(iOS) || os(tvOS)
137-
let bundle = Bundle(for: BundleToken.self)
90+
let bundle = BundleToken.bundle
13891
self.init(named: asset.name, in: bundle, compatibleWith: nil)
139-
#elseif os(OSX)
92+
#elseif os(macOS)
14093
self.init(named: NSImage.Name(asset.name))
14194
#elseif os(watchOS)
14295
self.init(named: asset.name)
14396
#endif
14497
}
14598
}
14699

147-
internal extension AssetColorTypeAlias {
148-
@available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
149-
convenience init!(asset: ColorAsset) {
150-
let bundle = Bundle(for: BundleToken.self)
151-
#if os(iOS) || os(tvOS)
152-
self.init(named: asset.name, in: bundle, compatibleWith: nil)
153-
#elseif os(OSX)
154-
self.init(named: NSColor.Name(asset.name), bundle: bundle)
155-
#elseif os(watchOS)
156-
self.init(named: asset.name)
100+
// swiftlint:disable convenience_type
101+
private final class BundleToken {
102+
static let bundle: Bundle = {
103+
#if SWIFT_PACKAGE
104+
return Bundle.module
105+
#else
106+
return Bundle(for: BundleToken.self)
157107
#endif
158-
}
108+
}()
159109
}
160-
161-
private final class BundleToken {}
110+
// swiftlint:enable convenience_type

‎Clipy/Generated/Colors.swift

+36-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
1+
// swiftlint:disable all
2+
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
23

34
#if os(OSX)
45
import AppKit.NSColor
@@ -8,21 +9,9 @@
89
internal typealias Color = UIColor
910
#endif
1011

11-
// swiftlint:disable superfluous_disable_command
12-
// swiftlint:disable file_length
12+
// swiftlint:disable superfluous_disable_command file_length implicit_return
1313

14-
// swiftlint:disable operator_usage_whitespace
15-
internal extension Color {
16-
convenience init(rgbaValue: UInt32) {
17-
let red = CGFloat((rgbaValue >> 24) & 0xff) / 255.0
18-
let green = CGFloat((rgbaValue >> 16) & 0xff) / 255.0
19-
let blue = CGFloat((rgbaValue >> 8) & 0xff) / 255.0
20-
let alpha = CGFloat((rgbaValue ) & 0xff) / 255.0
21-
22-
self.init(red: red, green: green, blue: blue, alpha: alpha)
23-
}
24-
}
25-
// swiftlint:enable operator_usage_whitespace
14+
// MARK: - Colors
2615

2716
// swiftlint:disable identifier_name line_length type_body_length
2817
internal struct ColorName {
@@ -41,6 +30,38 @@ internal struct ColorName {
4130
}
4231
// swiftlint:enable identifier_name line_length type_body_length
4332

33+
// MARK: - Implementation Details
34+
35+
internal extension Color {
36+
convenience init(rgbaValue: UInt32) {
37+
let components = RGBAComponents(rgbaValue: rgbaValue).normalized
38+
self.init(red: components[0], green: components[1], blue: components[2], alpha: components[3])
39+
}
40+
}
41+
42+
private struct RGBAComponents {
43+
let rgbaValue: UInt32
44+
45+
private var shifts: [UInt32] {
46+
[
47+
rgbaValue >> 24, // red
48+
rgbaValue >> 16, // green
49+
rgbaValue >> 8, // blue
50+
rgbaValue // alpha
51+
]
52+
}
53+
54+
private var components: [CGFloat] {
55+
shifts.map {
56+
CGFloat($0 & 0xff)
57+
}
58+
}
59+
60+
var normalized: [CGFloat] {
61+
components.map { $0 / 255.0 }
62+
}
63+
}
64+
4465
internal extension Color {
4566
convenience init(named color: ColorName) {
4667
self.init(rgbaValue: color.rgbaValue)

0 commit comments

Comments
 (0)