Skip to content

Commit df672df

Browse files
committed
[Update]Update ss.resource_bundle 'DoKit' => 'iOS/DoraemonKit/Resource/**/*'
# Image sets from Frameworks broken on Xcode 13? (Store only bug) # https://developer.apple.com/forums/thread/691272
1 parent 537822d commit df672df

File tree

4 files changed

+11
-51
lines changed

4 files changed

+11
-51
lines changed

DoraemonKit.podspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ iOS各式各样的工具集合
7373

7474
s.subspec 'Core' do |ss|
7575
ss.source_files = 'iOS/DoraemonKit/Src/Core/**/*.{h,m,c,mm}'
76+
77+
## Image sets from Frameworks broken on Xcode 13? (Store only bug)
78+
## https://developer.apple.com/forums/thread/691272
7679
ss.resource_bundle = {
77-
'DoraemonKit' => 'iOS/DoraemonKit/Resource/**/*'
80+
'DoKit' => 'iOS/DoraemonKit/Resource/**/*'
7881
}
7982
ss.dependency 'GCDWebServer'
8083
ss.dependency 'GCDWebServer/WebUploader'

iOS/DoraemonKit/Src/Core/Category/UIImage+Doraemon.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ + (nullable UIImage *)doraemon_imageNamed:(NSString *)name{
1414
if(name &&
1515
![name isEqualToString:@""]){
1616
NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"DoraemonManager")];
17-
NSURL *url = [bundle URLForResource:@"DoraemonKit" withExtension:@"bundle"];
17+
NSURL *url = [bundle URLForResource:@"DoKit" withExtension:@"bundle"];
1818
if(!url) return [UIImage new];
1919
NSBundle *imageBundle = [NSBundle bundleWithURL:url];
2020

@@ -42,7 +42,7 @@ + (nullable UIImage *)doraemon_xcassetImageNamed:(NSString *)name {
4242
if(name &&
4343
![name isEqualToString:@""]){
4444
NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"DoraemonManager")];
45-
NSURL *url = [bundle URLForResource:@"DoraemonKit" withExtension:@"bundle"];
45+
NSURL *url = [bundle URLForResource:@"DoKit" withExtension:@"bundle"];
4646
if(!url) return [UIImage new];
4747
NSBundle *imageBundle = [NSBundle bundleWithURL:url];
4848
UIImage *image = [UIImage imageNamed:name inBundle:imageBundle compatibleWithTraitCollection:nil];

iOS/DoraemonKit/Src/Core/Define/DoraemonDefine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#import "DoraemonAlertUtil.h"
1919
#import "DoraemonUtil.h"
2020

21-
#define DoKitVersion @"3.0.8"
21+
#define DoKitVersion @"3.1.3"
2222
#define DoKitKbChange(x) x * 1000
2323

2424
//#define DoKit_OpenLog

iOS/Podfile.lock

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,15 @@
11
PODS:
2-
- AFNetworking (3.2.1):
3-
- AFNetworking/NSURLSession (= 3.2.1)
4-
- AFNetworking/Reachability (= 3.2.1)
5-
- AFNetworking/Security (= 3.2.1)
6-
- AFNetworking/Serialization (= 3.2.1)
7-
- AFNetworking/UIKit (= 3.2.1)
8-
- AFNetworking/NSURLSession (3.2.1):
9-
- AFNetworking/Reachability
10-
- AFNetworking/Security
11-
- AFNetworking/Serialization
12-
- AFNetworking/Reachability (3.2.1)
13-
- AFNetworking/Security (3.2.1)
14-
- AFNetworking/Serialization (3.2.1)
15-
- AFNetworking/UIKit (3.2.1):
16-
- AFNetworking/NSURLSession
17-
- CocoaAsyncSocket (7.6.5)
18-
- CocoaHTTPServer (2.3):
19-
- CocoaAsyncSocket
20-
- CocoaLumberjack
21-
- CocoaLumberjack (3.7.4):
22-
- CocoaLumberjack/Core (= 3.7.4)
23-
- CocoaLumberjack/Core (3.7.4)
24-
- DoraemonKit/Core (3.1.2):
25-
- AFNetworking
2+
- DoraemonKit/Core (3.1.3):
263
- FMDB
274
- GCDWebServer
285
- GCDWebServer/WebDAV
296
- GCDWebServer/WebUploader
30-
- JSONModel
31-
- DoraemonKit/Foundation (3.1.2):
7+
- DoraemonKit/Foundation (3.1.3):
328
- Mantle (~> 2.2)
339
- SocketRocket (~> 0.6)
34-
- DoraemonKit/WithMultiControl (3.1.2):
35-
- AFNetworking (~> 3.0)
36-
- CocoaHTTPServer
37-
- CocoaLumberjack
10+
- DoraemonKit/WithMultiControl (3.1.3):
3811
- DoraemonKit/Core
3912
- DoraemonKit/Foundation
40-
- Masonry
41-
- SocketRocket
4213
- FMDB (2.7.5):
4314
- FMDB/standard (= 2.7.5)
4415
- FMDB/standard (2.7.5)
@@ -49,11 +20,9 @@ PODS:
4920
- GCDWebServer/Core
5021
- GCDWebServer/WebUploader (3.5.4):
5122
- GCDWebServer/Core
52-
- JSONModel (1.8.0)
5323
- Mantle (2.2.0):
5424
- Mantle/extobjc (= 2.2.0)
5525
- Mantle/extobjc (2.2.0)
56-
- Masonry (1.1.0)
5726
- SocketRocket (0.6.0)
5827

5928
DEPENDENCIES:
@@ -63,32 +32,20 @@ DEPENDENCIES:
6332

6433
SPEC REPOS:
6534
trunk:
66-
- AFNetworking
67-
- CocoaAsyncSocket
68-
- CocoaHTTPServer
69-
- CocoaLumberjack
7035
- FMDB
7136
- GCDWebServer
72-
- JSONModel
7337
- Mantle
74-
- Masonry
7538
- SocketRocket
7639

7740
EXTERNAL SOURCES:
7841
DoraemonKit:
7942
:path: ".."
8043

8144
SPEC CHECKSUMS:
82-
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
83-
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
84-
CocoaHTTPServer: 5624681fc3473d43b18202f635f9b3abb013b530
85-
CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
86-
DoraemonKit: e83daed152fb78832d2ac888e0302076bd3a9305
45+
DoraemonKit: 8f57a37370e87a229f0300a9e71ab1b9a841a742
8746
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
8847
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
89-
JSONModel: 02ab723958366a3fd27da57ea2af2113658762e9
9048
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
91-
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
9249
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
9350

9451
PODFILE CHECKSUM: e7b9fe686dd84effe497e10534550a42591d2938

0 commit comments

Comments
 (0)