Skip to content

Commit 402523a

Browse files
gee1kgee1k
committed
Merge branch 'release/v0.21.0'
2 parents a08a5ba + 90c5d5f commit 402523a

Some content is hidden

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

41 files changed

+263
-122
lines changed

‎Podfile.lock‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
22
- Alamofire (5.0.5)
3-
- CryptoSwift (1.3.1)
4-
- Kingfisher (5.14.1):
5-
- Kingfisher/Core (= 5.14.1)
6-
- Kingfisher/Core (5.14.1)
3+
- CryptoSwift (1.3.3)
4+
- Kingfisher (5.15.4):
5+
- Kingfisher/Core (= 5.15.4)
6+
- Kingfisher/Core (5.15.4)
77
- libminipng (0.5.6)
88
- LoginServiceKit (2.2.0)
99
- MASShortcut (2.4.0)
@@ -55,27 +55,27 @@ EXTERNAL SOURCES:
5555

5656
CHECKOUT OPTIONS:
5757
CryptoSwift:
58-
:commit: e793a595747c8f9b97b8de4ebde7b2a440f2d594
58+
:commit: e2bc81be54d71d566a52ca17c3983d141c30aa70
5959
:git: https://github.com/krzyzanowskim/CryptoSwift
6060
LoginServiceKit:
61-
:commit: 17a916dc09f1aab0f13e6edd1f77cdecee4d0ae8
61+
:commit: cf58b91b0ac247bd8bf5dccb5434ca60a930c1e1
6262
:git: https://github.com/Clipy/LoginServiceKit.git
6363
SwiftyXMLParser:
64-
:commit: 9d82653e535a13a518b411934c0a5c0c84406c22
64+
:commit: ec7f183642adf429babd867d1a38c5c6912408ba
6565
:git: https://github.com/yahoojapan/SwiftyXMLParser.git
6666

6767
SPEC CHECKSUMS:
6868
Alamofire: df2f8f826963b08b9a870791ad48e07a10090b2e
69-
CryptoSwift: 27c1f79acf3410c697981c2443076ad0880a62b4
70-
Kingfisher: 8050bc6f7f68cbf3908bd04df7ccbac188f6d6d6
69+
CryptoSwift: fedfc9f8362163ca381a78897ad810982e18d464
70+
Kingfisher: 657dc1077e5bbbfff864194c79f29e35b722d062
7171
libminipng: a44c35d06b9d54d6640acdf97f4500c034748abb
7272
LoginServiceKit: 3c86ce2f2bcd1e373326839d6d863d8a6a5915b4
7373
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
7474
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
7575
Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0
7676
SQLiteRepairKit: 35aaae5a8838adb85f5b1eb4d796055be6060a4b
7777
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
78-
SwiftyXMLParser: 8271497e0a37b5c04b0b167c77b4896e36175a21
78+
SwiftyXMLParser: 23b5a9321a8adf72aae29046ea58c3d097b4ac17
7979
WCDB.swift: 05d509d7a0e60fb6e11c34eb7e4027c0fab5849f
8080
WCDBOptimizedSQLCipher: baf44493b0c7a3d49e97bc5b64a3856f6428ddd1
8181

‎uPic.sketch‎

209 KB
Binary file not shown.

‎uPic.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@
12491249
CODE_SIGN_IDENTITY = "Apple Development";
12501250
CODE_SIGN_STYLE = Automatic;
12511251
COMBINE_HIDPI_IMAGES = YES;
1252-
CURRENT_PROJECT_VERSION = 20201002;
1252+
CURRENT_PROJECT_VERSION = 20201114;
12531253
DEVELOPMENT_TEAM = W863J6W8DZ;
12541254
ENABLE_HARDENED_RUNTIME = YES;
12551255
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1258,7 +1258,7 @@
12581258
"@executable_path/../Frameworks",
12591259
);
12601260
MACOSX_DEPLOYMENT_TARGET = 10.12;
1261-
MARKETING_VERSION = 0.20.1;
1261+
MARKETING_VERSION = 0.21.0;
12621262
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12631263
PRODUCT_NAME = "$(TARGET_NAME)";
12641264
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1279,7 +1279,7 @@
12791279
CODE_SIGN_IDENTITY = "Apple Development";
12801280
CODE_SIGN_STYLE = Automatic;
12811281
COMBINE_HIDPI_IMAGES = YES;
1282-
CURRENT_PROJECT_VERSION = 20201002;
1282+
CURRENT_PROJECT_VERSION = 20201114;
12831283
DEVELOPMENT_TEAM = W863J6W8DZ;
12841284
ENABLE_HARDENED_RUNTIME = YES;
12851285
INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1288,7 +1288,7 @@
12881288
"@executable_path/../Frameworks",
12891289
);
12901290
MACOSX_DEPLOYMENT_TARGET = 10.12;
1291-
MARKETING_VERSION = 0.20.1;
1291+
MARKETING_VERSION = 0.21.0;
12921292
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
12931293
PRODUCT_NAME = "$(TARGET_NAME)";
12941294
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1305,7 +1305,7 @@
13051305
CODE_SIGN_IDENTITY = "Apple Development";
13061306
CODE_SIGN_STYLE = Automatic;
13071307
COMBINE_HIDPI_IMAGES = YES;
1308-
CURRENT_PROJECT_VERSION = 20201002;
1308+
CURRENT_PROJECT_VERSION = 20201114;
13091309
DEVELOPMENT_TEAM = W863J6W8DZ;
13101310
ENABLE_HARDENED_RUNTIME = YES;
13111311
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1315,7 +1315,7 @@
13151315
"@executable_path/../../../../Frameworks",
13161316
);
13171317
MACOSX_DEPLOYMENT_TARGET = 10.12;
1318-
MARKETING_VERSION = 0.20.1;
1318+
MARKETING_VERSION = 0.21.0;
13191319
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
13201320
PRODUCT_NAME = "$(TARGET_NAME)";
13211321
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1332,7 +1332,7 @@
13321332
CODE_SIGN_IDENTITY = "Apple Development";
13331333
CODE_SIGN_STYLE = Automatic;
13341334
COMBINE_HIDPI_IMAGES = YES;
1335-
CURRENT_PROJECT_VERSION = 20201002;
1335+
CURRENT_PROJECT_VERSION = 20201114;
13361336
DEVELOPMENT_TEAM = W863J6W8DZ;
13371337
ENABLE_HARDENED_RUNTIME = YES;
13381338
INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1342,7 +1342,7 @@
13421342
"@executable_path/../../../../Frameworks",
13431343
);
13441344
MACOSX_DEPLOYMENT_TARGET = 10.12;
1345-
MARKETING_VERSION = 0.20.1;
1345+
MARKETING_VERSION = 0.21.0;
13461346
PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
13471347
PRODUCT_NAME = "$(TARGET_NAME)";
13481348
PROVISIONING_PROFILE_SPECIFIER = "";

‎uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎uPic/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
{
22
"images" : [
33
{
4-
"size" : "16x16",
5-
"idiom" : "mac",
64
"filename" : "mac-16x16.png",
7-
"scale" : "1x"
5+
"idiom" : "mac",
6+
"scale" : "1x",
7+
"size" : "16x16"
88
},
99
{
10-
"size" : "16x16",
11-
"idiom" : "mac",
1210
"filename" : "mac-16x16@2x.png",
13-
"scale" : "2x"
11+
"idiom" : "mac",
12+
"scale" : "2x",
13+
"size" : "16x16"
1414
},
1515
{
16-
"size" : "32x32",
17-
"idiom" : "mac",
1816
"filename" : "mac-32x32.png",
19-
"scale" : "1x"
17+
"idiom" : "mac",
18+
"scale" : "1x",
19+
"size" : "32x32"
2020
},
2121
{
22-
"size" : "32x32",
23-
"idiom" : "mac",
2422
"filename" : "mac-32x32@2x.png",
25-
"scale" : "2x"
23+
"idiom" : "mac",
24+
"scale" : "2x",
25+
"size" : "32x32"
2626
},
2727
{
28-
"size" : "128x128",
29-
"idiom" : "mac",
3028
"filename" : "mac-128x128.png",
31-
"scale" : "1x"
29+
"idiom" : "mac",
30+
"scale" : "1x",
31+
"size" : "128x128"
3232
},
3333
{
34-
"size" : "128x128",
35-
"idiom" : "mac",
3634
"filename" : "mac-128x128@2x.png",
37-
"scale" : "2x"
35+
"idiom" : "mac",
36+
"scale" : "2x",
37+
"size" : "128x128"
3838
},
3939
{
40-
"size" : "256x256",
41-
"idiom" : "mac",
4240
"filename" : "mac-256x256.png",
43-
"scale" : "1x"
41+
"idiom" : "mac",
42+
"scale" : "1x",
43+
"size" : "256x256"
4444
},
4545
{
46-
"size" : "256x256",
47-
"idiom" : "mac",
4846
"filename" : "mac-256x256@2x.png",
49-
"scale" : "2x"
47+
"idiom" : "mac",
48+
"scale" : "2x",
49+
"size" : "256x256"
5050
},
5151
{
52-
"size" : "512x512",
53-
"idiom" : "mac",
5452
"filename" : "mac-512x512.png",
55-
"scale" : "1x"
53+
"idiom" : "mac",
54+
"scale" : "1x",
55+
"size" : "512x512"
5656
},
5757
{
58-
"size" : "512x512",
59-
"idiom" : "mac",
6058
"filename" : "mac-512x512@2x.png",
61-
"scale" : "2x"
59+
"idiom" : "mac",
60+
"scale" : "2x",
61+
"size" : "512x512"
6262
}
6363
],
6464
"info" : {
65-
"version" : 1,
66-
"author" : "xcode"
65+
"author" : "xcode",
66+
"version" : 1
6767
}
68-
}
68+
}

‎uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128.png‎

-1.54 KB
Loading

‎uPic/Assets.xcassets/AppIcon.appiconset/mac-128x128@2x.png‎

-7.92 KB
Loading

‎uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16.png‎

-43 Bytes
Loading

‎uPic/Assets.xcassets/AppIcon.appiconset/mac-16x16@2x.png‎

-198 Bytes
Loading

‎uPic/Assets.xcassets/AppIcon.appiconset/mac-256x256.png‎

-7.92 KB
Loading

0 commit comments

Comments
 (0)