[Update]Update ss.resource_bundle 'DoKit' => 'iOS/DoraemonKit/Resourc…

…e/**/*' # Image sets from Frameworks broken on Xcode 13? (Store only bug) # https://developer.apple.com/forums/thread/691272
Vanson · Oct 19, 2022 · df672df · df672df
1 parent 537822d
commit df672df
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 51 deletions.
diff --git a/DoraemonKit.podspec b/DoraemonKit.podspec
@@ -73,8 +73,11 @@ iOS各式各样的工具集合
 
   s.subspec 'Core' do |ss| 
     ss.source_files = 'iOS/DoraemonKit/Src/Core/**/*.{h,m,c,mm}'
+
+    ## Image sets from Frameworks broken on Xcode 13? (Store only bug)
+    ## https://developer.apple.com/forums/thread/691272
     ss.resource_bundle = {
-      'DoraemonKit' => 'iOS/DoraemonKit/Resource/**/*'
+      'DoKit' => 'iOS/DoraemonKit/Resource/**/*'
     }
     ss.dependency 'GCDWebServer'
     ss.dependency 'GCDWebServer/WebUploader'

diff --git a/iOS/DoraemonKit/Src/Core/Category/UIImage+Doraemon.m b/iOS/DoraemonKit/Src/Core/Category/UIImage+Doraemon.m
@@ -14,7 +14,7 @@ + (nullable UIImage *)doraemon_imageNamed:(NSString *)name{
     if(name &&
        ![name isEqualToString:@""]){
         NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"DoraemonManager")];
-        NSURL *url = [bundle URLForResource:@"DoraemonKit" withExtension:@"bundle"];
+        NSURL *url = [bundle URLForResource:@"DoKit" withExtension:@"bundle"];
         if(!url) return [UIImage new];
         NSBundle *imageBundle = [NSBundle bundleWithURL:url];
 
@@ -42,7 +42,7 @@ + (nullable UIImage *)doraemon_xcassetImageNamed:(NSString *)name {
     if(name &&
        ![name isEqualToString:@""]){
         NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"DoraemonManager")];
-        NSURL *url = [bundle URLForResource:@"DoraemonKit" withExtension:@"bundle"];
+        NSURL *url = [bundle URLForResource:@"DoKit" withExtension:@"bundle"];
         if(!url) return [UIImage new];
         NSBundle *imageBundle = [NSBundle bundleWithURL:url];
         UIImage *image = [UIImage imageNamed:name inBundle:imageBundle compatibleWithTraitCollection:nil];

diff --git a/iOS/DoraemonKit/Src/Core/Define/DoraemonDefine.h b/iOS/DoraemonKit/Src/Core/Define/DoraemonDefine.h
@@ -18,7 +18,7 @@
 #import "DoraemonAlertUtil.h"
 #import "DoraemonUtil.h"
 
-#define DoKitVersion @"3.0.8"
+#define DoKitVersion @"3.1.3"
 #define DoKitKbChange(x) x * 1000
 
 //#define DoKit_OpenLog

diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock
@@ -1,44 +1,15 @@
 PODS:
-  - AFNetworking (3.2.1):
-    - AFNetworking/NSURLSession (= 3.2.1)
-    - AFNetworking/Reachability (= 3.2.1)
-    - AFNetworking/Security (= 3.2.1)
-    - AFNetworking/Serialization (= 3.2.1)
-    - AFNetworking/UIKit (= 3.2.1)
-  - AFNetworking/NSURLSession (3.2.1):
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-  - AFNetworking/Reachability (3.2.1)
-  - AFNetworking/Security (3.2.1)
-  - AFNetworking/Serialization (3.2.1)
-  - AFNetworking/UIKit (3.2.1):
-    - AFNetworking/NSURLSession
-  - CocoaAsyncSocket (7.6.5)
-  - CocoaHTTPServer (2.3):
-    - CocoaAsyncSocket
-    - CocoaLumberjack
-  - CocoaLumberjack (3.7.4):
-    - CocoaLumberjack/Core (= 3.7.4)
-  - CocoaLumberjack/Core (3.7.4)
-  - DoraemonKit/Core (3.1.2):
-    - AFNetworking
+  - DoraemonKit/Core (3.1.3):
     - FMDB
     - GCDWebServer
     - GCDWebServer/WebDAV
     - GCDWebServer/WebUploader
-    - JSONModel
-  - DoraemonKit/Foundation (3.1.2):
+  - DoraemonKit/Foundation (3.1.3):
     - Mantle (~> 2.2)
     - SocketRocket (~> 0.6)
-  - DoraemonKit/WithMultiControl (3.1.2):
-    - AFNetworking (~> 3.0)
-    - CocoaHTTPServer
-    - CocoaLumberjack
+  - DoraemonKit/WithMultiControl (3.1.3):
     - DoraemonKit/Core
     - DoraemonKit/Foundation
-    - Masonry
-    - SocketRocket
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -49,11 +20,9 @@ PODS:
     - GCDWebServer/Core
   - GCDWebServer/WebUploader (3.5.4):
     - GCDWebServer/Core
-  - JSONModel (1.8.0)
   - Mantle (2.2.0):
     - Mantle/extobjc (= 2.2.0)
   - Mantle/extobjc (2.2.0)
-  - Masonry (1.1.0)
   - SocketRocket (0.6.0)
 
 DEPENDENCIES:
@@ -63,32 +32,20 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - AFNetworking
-    - CocoaAsyncSocket
-    - CocoaHTTPServer
-    - CocoaLumberjack
     - FMDB
     - GCDWebServer
-    - JSONModel
     - Mantle
-    - Masonry
     - SocketRocket
 
 EXTERNAL SOURCES:
   DoraemonKit:
     :path: ".."
 
 SPEC CHECKSUMS:
-  AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  CocoaHTTPServer: 5624681fc3473d43b18202f635f9b3abb013b530
-  CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
-  DoraemonKit: e83daed152fb78832d2ac888e0302076bd3a9305
+  DoraemonKit: 8f57a37370e87a229f0300a9e71ab1b9a841a742
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
-  JSONModel: 02ab723958366a3fd27da57ea2af2113658762e9
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
 
 PODFILE CHECKSUM: e7b9fe686dd84effe497e10534550a42591d2938