Skip to content

Commit

Permalink
Merge branch 'release/v0.14.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gee1k
gee1k committed Dec 2, 2019
2 parents 9f04735 + ed7e41e commit ac0c06b
Show file tree
Hide file tree
Showing 38 changed files with 1,169 additions and 469 deletions.
2 changes: 1 addition & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ target 'uPic' do
use_frameworks!

pod 'SwiftyJSON'
pod 'Alamofire', '~> 5.0.0-rc.2'
pod 'Alamofire', '~> 5.0.0-rc.3'
pod 'MASShortcut'
pod 'CryptoSwift', :git => "https://github.com/krzyzanowskim/CryptoSwift", :branch => "master"
pod "SwiftyXMLParser", :git => 'https://github.com/yahoojapan/SwiftyXMLParser.git'
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Alamofire (5.0.0-rc.2)
- Alamofire (5.0.0-rc.3)
- CryptoSwift (1.2.0)
- Kingfisher (5.9.0):
- Kingfisher/Core (= 5.9.0)
Expand All @@ -11,7 +11,7 @@ PODS:
- SwiftyXMLParser (5.1.0)

DEPENDENCIES:
- Alamofire (~> 5.0.0-rc.2)
- Alamofire (~> 5.0.0-rc.3)
- CryptoSwift (from `https://github.com/krzyzanowskim/CryptoSwift`, branch `master`)
- Kingfisher
- MASShortcut
Expand Down Expand Up @@ -45,7 +45,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/yahoojapan/SwiftyXMLParser.git

SPEC CHECKSUMS:
Alamofire: f9450d3c7f6bea2ad62e7a541c3e9b186c7991d6
Alamofire: ca8c0de6906873be89d6deec5c8de279e00bf872
CryptoSwift: 40e374e45291d8dceedcb0d6184da94533eaabdf
Kingfisher: ff98240aebb7302bdc4f1ecd701761030ce18b16
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
Expand All @@ -54,6 +54,6 @@ SPEC CHECKSUMS:
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
SwiftyXMLParser: 8271497e0a37b5c04b0b167c77b4896e36175a21

PODFILE CHECKSUM: 3db51175519b196167037cd55cbc3403dd631842
PODFILE CHECKSUM: 565b96ccb1bd03559a1e77f0afdb53addedee28a

COCOAPODS: 1.8.4
56 changes: 28 additions & 28 deletions uPic.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
164745F022B65FE900F9575D /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164745EF22B65FE900F9575D /* String+Extension.swift */; };
1647474322B66ACE00F9575D /* Data+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1647474222B66ACE00F9575D /* Data+Extension.swift */; };
1647474522B66E3400F9575D /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1647474422B66E3400F9575D /* Util.swift */; };
1648A216238E742600B99B9D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1648A214238E742600B99B9D /* Main.storyboard */; };
164C3A0022B2AA6C003ADE39 /* Notifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164C39FF22B2AA6C003ADE39 /* Notifier.swift */; };
164C3A0222B2AB22003ADE39 /* ConfigNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164C3A0122B2AB22003ADE39 /* ConfigNotifier.swift */; };
1657019922C8922400C57EE9 /* WeiboHostConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1657019822C8920400C57EE9 /* WeiboHostConfig.swift */; };
Expand Down Expand Up @@ -123,7 +124,6 @@
68BBB6E5FFBB050D05107413 /* AmazonS3HostConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */; };
68BBB99780D7F4586458D4F5 /* AmazonS3Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */; };
8E879700A97E9294450D524F /* Pods_uPic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A116EF79D38D9092D34EFCF5 /* Pods_uPic.framework */; };
96F2D368235B424D001F74A5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96F2D36A235B424D001F74A5 /* Main.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -190,6 +190,9 @@
164745EF22B65FE900F9575D /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
1647474222B66ACE00F9575D /* Data+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Extension.swift"; sourceTree = "<group>"; };
1647474422B66E3400F9575D /* Util.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
1648A215238E742600B99B9D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
1648A217238E742F00B99B9D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
1648A218238E743200B99B9D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
164C39FF22B2AA6C003ADE39 /* Notifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifier.swift; sourceTree = "<group>"; };
164C3A0122B2AB22003ADE39 /* ConfigNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigNotifier.swift; sourceTree = "<group>"; };
1657019822C8920400C57EE9 /* WeiboHostConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeiboHostConfig.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -282,10 +285,7 @@
68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Util.swift; sourceTree = "<group>"; };
68BBB5C4550545707614BE4D /* AmazonS3Uploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Uploader.swift; sourceTree = "<group>"; };
68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3HostConfig.swift; sourceTree = "<group>"; };
96F2D369235B424D001F74A5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
96F2D36C235B42A0001F74A5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
96F2D370235B4317001F74A5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
96F2D372235B456F001F74A5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
961AA898238E9764005A25C9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
96F2D378235B48CF001F74A5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Preferences.strings"; sourceTree = "<group>"; };
A116EF79D38D9092D34EFCF5 /* Pods_uPic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uPic.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B31C410193F6C634ECBC8F5F /* Pods-uPic.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uPic.debug.xcconfig"; path = "Target Support Files/Pods-uPic/Pods-uPic.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -572,7 +572,7 @@
16A6DC5622AA375700813706 /* uPic */ = {
isa = PBXGroup;
children = (
96F2D36A235B424D001F74A5 /* Main.storyboard */,
1648A214238E742600B99B9D /* Main.storyboard */,
16BDDE0222EAA2920080E467 /* Assets.xcassets */,
16A6DC5722AA375700813706 /* AppDelegate.swift */,
1623612522AB951E00E4025C /* Localizable.strings */,
Expand Down Expand Up @@ -819,8 +819,8 @@
buildActionMask = 2147483647;
files = (
1623612322AB951E00E4025C /* Localizable.strings in Resources */,
1648A216238E742600B99B9D /* Main.storyboard in Resources */,
1623611B22AB935300E4025C /* InfoPlist.strings in Resources */,
96F2D368235B424D001F74A5 /* Main.storyboard in Resources */,
169F073B22AF53DE008E8525 /* Preferences.storyboard in Resources */,
16BDDE0322EAA2920080E467 /* Assets.xcassets in Resources */,
);
Expand Down Expand Up @@ -1044,12 +1044,22 @@
name = Localizable.strings;
sourceTree = "<group>";
};
1648A214238E742600B99B9D /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
1648A215238E742600B99B9D /* Base */,
1648A217238E742F00B99B9D /* en */,
1648A218238E743200B99B9D /* zh-Hans */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
169F073D22AF53DE008E8525 /* Preferences.storyboard */ = {
isa = PBXVariantGroup;
children = (
169F073C22AF53DE008E8525 /* Base */,
96F2D372235B456F001F74A5 /* en */,
96F2D378235B48CF001F74A5 /* zh-Hans */,
961AA898238E9764005A25C9 /* en */,
);
name = Preferences.storyboard;
sourceTree = "<group>";
Expand All @@ -1062,16 +1072,6 @@
name = Main.storyboard;
sourceTree = "<group>";
};
96F2D36A235B424D001F74A5 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
96F2D369235B424D001F74A5 /* Base */,
96F2D36C235B42A0001F74A5 /* en */,
96F2D370235B4317001F74A5 /* zh-Hans */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -1200,10 +1200,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "uPic/Supporting Files/uPic.entitlements";
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20191126;
CURRENT_PROJECT_VERSION = 20191202;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand All @@ -1212,7 +1212,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.14.1;
MARKETING_VERSION = 0.14.2;
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1230,10 +1230,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "uPic/Supporting Files/uPic.entitlements";
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20191126;
CURRENT_PROJECT_VERSION = 20191202;
DEVELOPMENT_TEAM = W863J6W8DZ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
Expand All @@ -1242,7 +1242,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 0.14.1;
MARKETING_VERSION = 0.14.2;
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1256,7 +1256,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = uPicHelper/uPicHelper.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
Expand All @@ -1279,7 +1279,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = uPicHelper/uPicHelper.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
Expand All @@ -1302,7 +1302,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
CODE_SIGN_ENTITLEMENTS = uPicFinderExtension/uPicFinderExtension.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
Expand All @@ -1327,7 +1327,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
CODE_SIGN_ENTITLEMENTS = uPicFinderExtension/uPicFinderExtension.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = W863J6W8DZ;
Expand Down
2 changes: 1 addition & 1 deletion uPic/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
self.setupStatusBar()

self.bindShortcuts()

// 添加 Finder 右键文件上传监听
UploadNotifier.addObserver(observer: self, selector: #selector(uploadFilesFromFinderMenu), notification: .uploadFiles)
}
Expand Down
2 changes: 1 addition & 1 deletion uPic/Assets.xcassets/host_icon_6.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "GitHub.png",
"filename" : "github.png",
"scale" : "1x"
},
{
Expand Down
0 ....xcassets/host_icon_6.imageset/GitHub.png → ....xcassets/host_icon_6.imageset/github.png
View file
File renamed without changes
4 changes: 2 additions & 2 deletions uPic/Assets.xcassets/statusIcon.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "menubar.png",
"filename" : "menubar@2x.png.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "menubar@2x.png",
"filename" : "menubar@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ....xcassets/statusIcon.imageset/menubar.png → ...ts/statusIcon.imageset/[email protected]
View file
File renamed without changes
0 ...assets/statusIcon.imageset/[email protected] → ...assets/statusIcon.imageset/[email protected]
View file
File renamed without changes
4 changes: 2 additions & 2 deletions uPic/Assets.xcassets/uploadIcon.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "wait.png",
"filename" : "wait@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "wait@2x.png",
"filename" : "wait@3x.png",
"scale" : "3x"
}
],
Expand Down
Binary file removed uPic/Assets.xcassets/uploadIcon.imageset/wait.png
View file
Binary file not shown.
Binary file modified uPic/Assets.xcassets/uploadIcon.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/uploadIcon.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ac0c06b

Please sign in to comment.