Skip to content

Commit ac0c06b

Browse files
gee1kgee1k
committed
Merge branch 'release/v0.14.2'
2 parents 9f04735 + ed7e41e commit ac0c06b

38 files changed

+1169
-469
lines changed

‎Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ target 'uPic' do
88
use_frameworks!
99

1010
pod 'SwiftyJSON'
11-
pod 'Alamofire', '~> 5.0.0-rc.2'
11+
pod 'Alamofire', '~> 5.0.0-rc.3'
1212
pod 'MASShortcut'
1313
pod 'CryptoSwift', :git => "https://github.com/krzyzanowskim/CryptoSwift", :branch => "master"
1414
pod "SwiftyXMLParser", :git => 'https://github.com/yahoojapan/SwiftyXMLParser.git'

‎Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- Alamofire (5.0.0-rc.2)
2+
- Alamofire (5.0.0-rc.3)
33
- CryptoSwift (1.2.0)
44
- Kingfisher (5.9.0):
55
- Kingfisher/Core (= 5.9.0)
@@ -11,7 +11,7 @@ PODS:
1111
- SwiftyXMLParser (5.1.0)
1212

1313
DEPENDENCIES:
14-
- Alamofire (~> 5.0.0-rc.2)
14+
- Alamofire (~> 5.0.0-rc.3)
1515
- CryptoSwift (from `https://github.com/krzyzanowskim/CryptoSwift`, branch `master`)
1616
- Kingfisher
1717
- MASShortcut
@@ -45,7 +45,7 @@ CHECKOUT OPTIONS:
4545
:git: https://github.com/yahoojapan/SwiftyXMLParser.git
4646

4747
SPEC CHECKSUMS:
48-
Alamofire: f9450d3c7f6bea2ad62e7a541c3e9b186c7991d6
48+
Alamofire: ca8c0de6906873be89d6deec5c8de279e00bf872
4949
CryptoSwift: 40e374e45291d8dceedcb0d6184da94533eaabdf
5050
Kingfisher: ff98240aebb7302bdc4f1ecd701761030ce18b16
5151
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
@@ -54,6 +54,6 @@ SPEC CHECKSUMS:
5454
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
5555
SwiftyXMLParser: 8271497e0a37b5c04b0b167c77b4896e36175a21
5656

57-
PODFILE CHECKSUM: 3db51175519b196167037cd55cbc3403dd631842
57+
PODFILE CHECKSUM: 565b96ccb1bd03559a1e77f0afdb53addedee28a
5858

5959
COCOAPODS: 1.8.4

‎uPic.xcodeproj/project.pbxproj

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
164745F022B65FE900F9575D /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164745EF22B65FE900F9575D /* String+Extension.swift */; };
3939
1647474322B66ACE00F9575D /* Data+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1647474222B66ACE00F9575D /* Data+Extension.swift */; };
4040
1647474522B66E3400F9575D /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1647474422B66E3400F9575D /* Util.swift */; };
41+
1648A216238E742600B99B9D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1648A214238E742600B99B9D /* Main.storyboard */; };
4142
164C3A0022B2AA6C003ADE39 /* Notifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164C39FF22B2AA6C003ADE39 /* Notifier.swift */; };
4243
164C3A0222B2AB22003ADE39 /* ConfigNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164C3A0122B2AB22003ADE39 /* ConfigNotifier.swift */; };
4344
1657019922C8922400C57EE9 /* WeiboHostConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1657019822C8920400C57EE9 /* WeiboHostConfig.swift */; };
@@ -123,7 +124,6 @@
123124
68BBB6E5FFBB050D05107413 /* AmazonS3HostConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */; };
124125
68BBB99780D7F4586458D4F5 /* AmazonS3Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */; };
125126
8E879700A97E9294450D524F /* Pods_uPic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A116EF79D38D9092D34EFCF5 /* Pods_uPic.framework */; };
126-
96F2D368235B424D001F74A5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96F2D36A235B424D001F74A5 /* Main.storyboard */; };
127127
/* End PBXBuildFile section */
128128

129129
/* Begin PBXContainerItemProxy section */
@@ -190,6 +190,9 @@
190190
164745EF22B65FE900F9575D /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
191191
1647474222B66ACE00F9575D /* Data+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Extension.swift"; sourceTree = "<group>"; };
192192
1647474422B66E3400F9575D /* Util.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
193+
1648A215238E742600B99B9D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
194+
1648A217238E742F00B99B9D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
195+
1648A218238E743200B99B9D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
193196
164C39FF22B2AA6C003ADE39 /* Notifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifier.swift; sourceTree = "<group>"; };
194197
164C3A0122B2AB22003ADE39 /* ConfigNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigNotifier.swift; sourceTree = "<group>"; };
195198
1657019822C8920400C57EE9 /* WeiboHostConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeiboHostConfig.swift; sourceTree = "<group>"; };
@@ -282,10 +285,7 @@
282285
68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Util.swift; sourceTree = "<group>"; };
283286
68BBB5C4550545707614BE4D /* AmazonS3Uploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Uploader.swift; sourceTree = "<group>"; };
284287
68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3HostConfig.swift; sourceTree = "<group>"; };
285-
96F2D369235B424D001F74A5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
286-
96F2D36C235B42A0001F74A5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
287-
96F2D370235B4317001F74A5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
288-
96F2D372235B456F001F74A5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
288+
961AA898238E9764005A25C9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
289289
96F2D378235B48CF001F74A5 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Preferences.strings"; sourceTree = "<group>"; };
290290
A116EF79D38D9092D34EFCF5 /* Pods_uPic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uPic.framework; sourceTree = BUILT_PRODUCTS_DIR; };
291291
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>"; };
@@ -572,7 +572,7 @@
572572
16A6DC5622AA375700813706 /* uPic */ = {
573573
isa = PBXGroup;
574574
children = (
575-
96F2D36A235B424D001F74A5 /* Main.storyboard */,
575+
1648A214238E742600B99B9D /* Main.storyboard */,
576576
16BDDE0222EAA2920080E467 /* Assets.xcassets */,
577577
16A6DC5722AA375700813706 /* AppDelegate.swift */,
578578
1623612522AB951E00E4025C /* Localizable.strings */,
@@ -819,8 +819,8 @@
819819
buildActionMask = 2147483647;
820820
files = (
821821
1623612322AB951E00E4025C /* Localizable.strings in Resources */,
822+
1648A216238E742600B99B9D /* Main.storyboard in Resources */,
822823
1623611B22AB935300E4025C /* InfoPlist.strings in Resources */,
823-
96F2D368235B424D001F74A5 /* Main.storyboard in Resources */,
824824
169F073B22AF53DE008E8525 /* Preferences.storyboard in Resources */,
825825
16BDDE0322EAA2920080E467 /* Assets.xcassets in Resources */,
826826
);
@@ -1044,12 +1044,22 @@
10441044
name = Localizable.strings;
10451045
sourceTree = "<group>";
10461046
};
1047+
1648A214238E742600B99B9D /* Main.storyboard */ = {
1048+
isa = PBXVariantGroup;
1049+
children = (
1050+
1648A215238E742600B99B9D /* Base */,
1051+
1648A217238E742F00B99B9D /* en */,
1052+
1648A218238E743200B99B9D /* zh-Hans */,
1053+
);
1054+
name = Main.storyboard;
1055+
sourceTree = "<group>";
1056+
};
10471057
169F073D22AF53DE008E8525 /* Preferences.storyboard */ = {
10481058
isa = PBXVariantGroup;
10491059
children = (
10501060
169F073C22AF53DE008E8525 /* Base */,
1051-
96F2D372235B456F001F74A5 /* en */,
10521061
96F2D378235B48CF001F74A5 /* zh-Hans */,
1062+
961AA898238E9764005A25C9 /* en */,
10531063
);
10541064
name = Preferences.storyboard;
10551065
sourceTree = "<group>";
@@ -1062,16 +1072,6 @@
10621072
name = Main.storyboard;
10631073
sourceTree = "<group>";
10641074
};
1065-
96F2D36A235B424D001F74A5 /* Main.storyboard */ = {
1066-
isa = PBXVariantGroup;
1067-
children = (
1068-
96F2D369235B424D001F74A5 /* Base */,
1069-
96F2D36C235B42A0001F74A5 /* en */,
1070-
96F2D370235B4317001F74A5 /* zh-Hans */,
1071-
);
1072-
name = Main.storyboard;
1073-
sourceTree = "<group>";
1074-
};
10751075
/* End PBXVariantGroup section */
10761076

10771077
/* Begin XCBuildConfiguration section */
@@ -1200,10 +1200,10 @@
12001200
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
12011201
CLANG_ENABLE_MODULES = YES;
12021202
CODE_SIGN_ENTITLEMENTS = "uPic/Supporting Files/uPic.entitlements";
1203-
CODE_SIGN_IDENTITY = "Mac Developer";
1203+
CODE_SIGN_IDENTITY = "Apple Development";
12041204
CODE_SIGN_STYLE = Manual;
12051205
COMBINE_HIDPI_IMAGES = YES;
1206-
CURRENT_PROJECT_VERSION = 20191126;
1206+
CURRENT_PROJECT_VERSION = 20191202;
12071207
DEVELOPMENT_TEAM = W863J6W8DZ;
12081208
ENABLE_HARDENED_RUNTIME = YES;
12091209
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1212,7 +1212,7 @@
12121212
"@executable_path/../Frameworks",
12131213
);
12141214
MACOSX_DEPLOYMENT_TARGET = 10.12;
1215-
MARKETING_VERSION = 0.14.1;
1215+
MARKETING_VERSION = 0.14.2;
12161216
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12171217
PRODUCT_NAME = "$(TARGET_NAME)";
12181218
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1230,10 +1230,10 @@
12301230
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
12311231
CLANG_ENABLE_MODULES = YES;
12321232
CODE_SIGN_ENTITLEMENTS = "uPic/Supporting Files/uPic.entitlements";
1233-
CODE_SIGN_IDENTITY = "Mac Developer";
1233+
CODE_SIGN_IDENTITY = "Apple Development";
12341234
CODE_SIGN_STYLE = Manual;
12351235
COMBINE_HIDPI_IMAGES = YES;
1236-
CURRENT_PROJECT_VERSION = 20191126;
1236+
CURRENT_PROJECT_VERSION = 20191202;
12371237
DEVELOPMENT_TEAM = W863J6W8DZ;
12381238
ENABLE_HARDENED_RUNTIME = YES;
12391239
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1242,7 +1242,7 @@
12421242
"@executable_path/../Frameworks",
12431243
);
12441244
MACOSX_DEPLOYMENT_TARGET = 10.12;
1245-
MARKETING_VERSION = 0.14.1;
1245+
MARKETING_VERSION = 0.14.2;
12461246
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12471247
PRODUCT_NAME = "$(TARGET_NAME)";
12481248
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1256,7 +1256,7 @@
12561256
buildSettings = {
12571257
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
12581258
CODE_SIGN_ENTITLEMENTS = uPicHelper/uPicHelper.entitlements;
1259-
CODE_SIGN_IDENTITY = "Mac Developer";
1259+
CODE_SIGN_IDENTITY = "Apple Development";
12601260
CODE_SIGN_STYLE = Manual;
12611261
COMBINE_HIDPI_IMAGES = YES;
12621262
DEVELOPMENT_TEAM = W863J6W8DZ;
@@ -1279,7 +1279,7 @@
12791279
buildSettings = {
12801280
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
12811281
CODE_SIGN_ENTITLEMENTS = uPicHelper/uPicHelper.entitlements;
1282-
CODE_SIGN_IDENTITY = "Mac Developer";
1282+
CODE_SIGN_IDENTITY = "Apple Development";
12831283
CODE_SIGN_STYLE = Manual;
12841284
COMBINE_HIDPI_IMAGES = YES;
12851285
DEVELOPMENT_TEAM = W863J6W8DZ;
@@ -1302,7 +1302,7 @@
13021302
buildSettings = {
13031303
APPLICATION_EXTENSION_API_ONLY = NO;
13041304
CODE_SIGN_ENTITLEMENTS = uPicFinderExtension/uPicFinderExtension.entitlements;
1305-
CODE_SIGN_IDENTITY = "Mac Developer";
1305+
CODE_SIGN_IDENTITY = "Apple Development";
13061306
CODE_SIGN_STYLE = Manual;
13071307
COMBINE_HIDPI_IMAGES = YES;
13081308
DEVELOPMENT_TEAM = W863J6W8DZ;
@@ -1327,7 +1327,7 @@
13271327
buildSettings = {
13281328
APPLICATION_EXTENSION_API_ONLY = NO;
13291329
CODE_SIGN_ENTITLEMENTS = uPicFinderExtension/uPicFinderExtension.entitlements;
1330-
CODE_SIGN_IDENTITY = "Mac Developer";
1330+
CODE_SIGN_IDENTITY = "Apple Development";
13311331
CODE_SIGN_STYLE = Manual;
13321332
COMBINE_HIDPI_IMAGES = YES;
13331333
DEVELOPMENT_TEAM = W863J6W8DZ;

‎uPic/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
5252
self.setupStatusBar()
5353

5454
self.bindShortcuts()
55-
55+
5656
// 添加 Finder 右键文件上传监听
5757
UploadNotifier.addObserver(observer: self, selector: #selector(uploadFilesFromFinderMenu), notification: .uploadFiles)
5858
}

‎uPic/Assets.xcassets/host_icon_6.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "GitHub.png",
5+
"filename" : "github.png",
66
"scale" : "1x"
77
},
88
{

‎uPic/Assets.xcassets/host_icon_6.imageset/GitHub.png renamed to ‎uPic/Assets.xcassets/host_icon_6.imageset/github.png

File renamed without changes.

‎uPic/Assets.xcassets/statusIcon.imageset/Contents.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
},
77
{
88
"idiom" : "universal",
9-
"filename" : "menubar.png",
9+
"filename" : "menubar@2x.png.png",
1010
"scale" : "2x"
1111
},
1212
{
1313
"idiom" : "universal",
14-
"filename" : "menubar@2x.png",
14+
"filename" : "menubar@3x.png",
1515
"scale" : "3x"
1616
}
1717
],

‎uPic/Assets.xcassets/statusIcon.imageset/menubar.png renamed to ‎uPic/Assets.xcassets/statusIcon.imageset/menubar@2x.png.png

File renamed without changes.

‎uPic/Assets.xcassets/statusIcon.imageset/menubar@2x.png renamed to ‎uPic/Assets.xcassets/statusIcon.imageset/menubar@3x.png

File renamed without changes.

‎uPic/Assets.xcassets/uploadIcon.imageset/Contents.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
},
77
{
88
"idiom" : "universal",
9-
"filename" : "wait.png",
9+
"filename" : "wait@2x.png",
1010
"scale" : "2x"
1111
},
1212
{
1313
"idiom" : "universal",
14-
"filename" : "wait@2x.png",
14+
"filename" : "wait@3x.png",
1515
"scale" : "3x"
1616
}
1717
],

‎uPic/Assets.xcassets/uploadIcon.imageset/wait.png

-635 Bytes
Binary file not shown.

‎uPic/Assets.xcassets/uploadIcon.imageset/wait@2x.png

-612 Bytes
Loading

‎uPic/Assets.xcassets/uploadIcon.imageset/wait@3x.png

1.22 KB
Loading

0 commit comments

Comments
 (0)