From af89b2bee2926548cd8a203ddcbbff2ef732027c Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Mon, 13 Jan 2025 23:03:32 +0800 Subject: [PATCH 01/14] Create Package.swift --- Package.swift | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..7688b49 --- /dev/null +++ b/Package.swift @@ -0,0 +1,70 @@ +// swift-tools-version:5.5 + +import PackageDescription + +let package = Package( + name: "OpenIMSDK", + platforms: [ + .iOS(.v11) + ], + products: [ + .library( + name: "OpenIMSDK", + targets: ["OpenIMSDK"] + ) + ], + dependencies: [ + .package(url: "https://github.com/OpenIMSDK/Open-IM-SDK-Core.git", .exact("3.8.3")), + .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0") + ], + targets: [ + .target( + name: "OpenIMSDK", + dependencies: [ + "OpenIMSDKCore", + "MJExtension", + .target(name: "Utils"), + .target(name: "CallbackProxy"), + .target(name: "Model"), + .target(name: "Interface"), + .target(name: "Callbacker") + ], + path: "OpenIMSDK", + exclude: ["LICENSE"], + sources: ["OpenIMSDK.{h,m}"], + publicHeadersPath: ".", + cSettings: [ + .define("VALID_ARCHS", to: "armv7s arm64 x86_64") + ] + ), + .target( + name: "Utils", + path: "OpenIMSDK/Utils", + sources: ["*.{h,m}"] + ), + .target( + name: "CallbackProxy", + dependencies: ["Utils"], + path: "OpenIMSDK/CallbackProxy", + sources: ["*.{h,m}"] + ), + .target( + name: "Model", + dependencies: ["Utils"], + path: "OpenIMSDK/Model", + sources: ["*.{h,m}"] + ), + .target( + name: "Interface", + dependencies: ["Model", "CallbackProxy", "Callbacker"], + path: "OpenIMSDK/Interface", + sources: ["*.{h,m}"] + ), + .target( + name: "Callbacker", + dependencies: ["Model", "Utils"], + path: "OpenIMSDK/Callbacker", + sources: ["*.{h,m}"] + ) + ] +) \ No newline at end of file From 3e6ffb92e5eb642b7958cc5fc3368d4aeef29709 Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Mon, 13 Jan 2025 23:14:09 +0800 Subject: [PATCH 02/14] Update package file --- .gitignore | 1 + Package.swift | 65 ++++++++++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index ba5a8b3..8c9d5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Xcode build/ +.build/ *.pbxuser !default.pbxuser *.mode1v3 diff --git a/Package.swift b/Package.swift index 7688b49..7bf7745 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,4 @@ -// swift-tools-version:5.5 - +// swift-tools-version:5.3 import PackageDescription let package = Package( @@ -14,8 +13,8 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/OpenIMSDK/Open-IM-SDK-Core.git", .exact("3.8.3")), - .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0") + .package(url: "https://github.com/OpenIMSDK/OpenIMSDKCore-iOS", .exact("3.8.3")), + .package(url: "https://github.com/CoderMJLee/MJExtension", from: "3.0.0"), ], targets: [ .target( @@ -23,48 +22,46 @@ let package = Package( dependencies: [ "OpenIMSDKCore", "MJExtension", - .target(name: "Utils"), - .target(name: "CallbackProxy"), - .target(name: "Model"), - .target(name: "Interface"), - .target(name: "Callbacker") ], path: "OpenIMSDK", - exclude: ["LICENSE"], - sources: ["OpenIMSDK.{h,m}"], + sources: ["OpenIMSDK.h", "OpenIMSDK.m"], publicHeadersPath: ".", cSettings: [ - .define("VALID_ARCHS", to: "armv7s arm64 x86_64") + .headerSearchPath(".") ] ), .target( - name: "Utils", - path: "OpenIMSDK/Utils", - sources: ["*.{h,m}"] + name: "OpenIMSDKUtils", + dependencies: [], + path: "OpenIMSDK/Utils" ), .target( - name: "CallbackProxy", - dependencies: ["Utils"], - path: "OpenIMSDK/CallbackProxy", - sources: ["*.{h,m}"] + name: "OpenIMSDKCallbackProxy", + dependencies: ["OpenIMSDKUtils"], + path: "OpenIMSDK/CallbackProxy" ), .target( - name: "Model", - dependencies: ["Utils"], - path: "OpenIMSDK/Model", - sources: ["*.{h,m}"] + name: "OpenIMSDKModel", + dependencies: ["OpenIMSDKUtils"], + path: "OpenIMSDK/Model" ), .target( - name: "Interface", - dependencies: ["Model", "CallbackProxy", "Callbacker"], - path: "OpenIMSDK/Interface", - sources: ["*.{h,m}"] + name: "OpenIMSDKCallbacker", + dependencies: [ + "OpenIMSDKModel", + "OpenIMSDKUtils", + ], + path: "OpenIMSDK/Callbacker" ), .target( - name: "Callbacker", - dependencies: ["Model", "Utils"], - path: "OpenIMSDK/Callbacker", - sources: ["*.{h,m}"] - ) - ] -) \ No newline at end of file + name: "OpenIMSDKInterface", + dependencies: [ + "OpenIMSDKModel", + "OpenIMSDKCallbackProxy", + "OpenIMSDKCallbacker", + ], + path: "OpenIMSDK/Interface" + ), + ], + cxxLanguageStandard: .cxx14 +) From e7293ddcdbb96bce71f18be7cb23942b238a8577 Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Mon, 13 Jan 2025 23:17:53 +0800 Subject: [PATCH 03/14] Update Package.swift - add package verison --- Package.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 7bf7745..e8efdac 100644 --- a/Package.swift +++ b/Package.swift @@ -13,8 +13,9 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/OpenIMSDK/OpenIMSDKCore-iOS", .exact("3.8.3")), - .package(url: "https://github.com/CoderMJLee/MJExtension", from: "3.0.0"), + // Updated repository URL + .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", .exact("1.0.0")), + .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0"), ], targets: [ .target( From 0d1f25bd3fa85c2224dd97880db9ae5b45dca483 Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Wed, 15 Jan 2025 16:23:07 +0800 Subject: [PATCH 04/14] Update Package.swift targets name --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e8efdac..d95483d 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( products: [ .library( name: "OpenIMSDK", - targets: ["OpenIMSDK"] + targets: ["open-im-sdk-ios"] ) ], dependencies: [ From 51b60219c6323dae8b6f29eaf7c069f7af659fd7 Mon Sep 17 00:00:00 2001 From: Rocket Jerry Date: Thu, 16 Jan 2025 22:49:44 +0800 Subject: [PATCH 05/14] Update Package file --- Package.swift | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Package.swift b/Package.swift index d95483d..f7c2e87 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 import PackageDescription let package = Package( @@ -7,14 +7,9 @@ let package = Package( .iOS(.v11) ], products: [ - .library( - name: "OpenIMSDK", - targets: ["open-im-sdk-ios"] - ) + .library(name: "OpenIMSDK", targets: ["OpenIMSDK"]) ], dependencies: [ - // Updated repository URL - .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", .exact("1.0.0")), .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0"), ], targets: [ @@ -25,7 +20,7 @@ let package = Package( "MJExtension", ], path: "OpenIMSDK", - sources: ["OpenIMSDK.h", "OpenIMSDK.m"], + sources: ["OpenIMSDK.h"], publicHeadersPath: ".", cSettings: [ .headerSearchPath(".") From 8a93dd4639de526ec28f9c6769e6af77a8cc2cef Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Thu, 16 Jan 2025 23:17:37 +0800 Subject: [PATCH 06/14] Restruct folder --- Package.resolved | 16 +++++++ Package.swift | 42 ++----------------- .../OpenIMSDK}/CallbackProxy/CallbackProxy.h | 0 .../OpenIMSDK}/CallbackProxy/CallbackProxy.m | 0 .../CallbackProxy/SendMessageCallbackProxy.h | 0 .../CallbackProxy/SendMessageCallbackProxy.m | 0 .../CallbackProxy/UploadFileCallbackProxy.h | 0 .../CallbackProxy/UploadFileCallbackProxy.m | 0 .../Callbacker/OIMCallbacker+Closure.h | 0 .../Callbacker/OIMCallbacker+Closure.m | 0 .../OpenIMSDK}/Callbacker/OIMCallbacker.h | 0 .../OpenIMSDK}/Callbacker/OIMCallbacker.m | 0 .../Callbacker/OIMGCDMulticastDelegate.h | 0 .../Callbacker/OIMGCDMulticastDelegate.m | 0 .../Interface/OIMManager+Connection.h | 0 .../Interface/OIMManager+Connection.m | 0 .../Interface/OIMManager+Conversation.h | 0 .../Interface/OIMManager+Conversation.m | 0 .../OpenIMSDK}/Interface/OIMManager+Friend.h | 0 .../OpenIMSDK}/Interface/OIMManager+Friend.m | 0 .../OpenIMSDK}/Interface/OIMManager+Group.h | 0 .../OpenIMSDK}/Interface/OIMManager+Group.m | 0 .../OpenIMSDK}/Interface/OIMManager+Login.h | 0 .../OpenIMSDK}/Interface/OIMManager+Login.m | 0 .../OpenIMSDK}/Interface/OIMManager+Message.h | 0 .../OpenIMSDK}/Interface/OIMManager+Message.m | 0 .../OpenIMSDK}/Interface/OIMManager+User.h | 0 .../OpenIMSDK}/Interface/OIMManager+User.m | 0 .../OpenIMSDK}/Interface/OIMManager.h | 0 .../OpenIMSDK}/Interface/OIMManager.m | 0 .../OpenIMSDK}/Model/OIMAtElem.h | 0 .../OpenIMSDK}/Model/OIMAtElem.m | 0 .../OpenIMSDK}/Model/OIMAttachedInfoElem.h | 0 .../OpenIMSDK}/Model/OIMAttachedInfoElem.m | 0 .../OpenIMSDK}/Model/OIMConversationInfo.h | 0 .../OpenIMSDK}/Model/OIMConversationInfo.m | 0 .../OpenIMSDK}/Model/OIMCustomElem.h | 0 .../OpenIMSDK}/Model/OIMCustomElem.m | 0 .../OpenIMSDK}/Model/OIMFaceElem.h | 0 .../OpenIMSDK}/Model/OIMFaceElem.m | 0 .../OpenIMSDK}/Model/OIMFileElem.h | 0 .../OpenIMSDK}/Model/OIMFileElem.m | 0 .../OpenIMSDK}/Model/OIMFriendApplication.h | 0 .../OpenIMSDK}/Model/OIMFriendApplication.m | 0 .../OpenIMSDK}/Model/OIMFullUserInfo.h | 0 .../OpenIMSDK}/Model/OIMFullUserInfo.m | 0 .../Model/OIMGroupApplicationInfo.h | 0 .../Model/OIMGroupApplicationInfo.m | 0 .../OpenIMSDK}/Model/OIMGroupInfo.h | 0 .../OpenIMSDK}/Model/OIMGroupInfo.m | 0 .../OpenIMSDK}/Model/OIMGroupMemberInfo.h | 0 .../OpenIMSDK}/Model/OIMGroupMemberInfo.m | 0 .../OpenIMSDK}/Model/OIMLocationElem.h | 0 .../OpenIMSDK}/Model/OIMLocationElem.m | 0 .../OpenIMSDK}/Model/OIMMergeElem.h | 0 .../OpenIMSDK}/Model/OIMMergeElem.m | 0 .../OpenIMSDK}/Model/OIMMessageElem.h | 0 .../OpenIMSDK}/Model/OIMMessageElem.m | 0 .../OpenIMSDK}/Model/OIMMessageInfo.h | 0 .../OpenIMSDK}/Model/OIMMessageInfo.m | 0 .../OpenIMSDK}/Model/OIMNotificationElem.h | 0 .../OpenIMSDK}/Model/OIMNotificationElem.m | 0 .../OpenIMSDK}/Model/OIMPictureElem.h | 0 .../OpenIMSDK}/Model/OIMPictureElem.m | 0 .../OpenIMSDK}/Model/OIMQuoteElem.h | 0 .../OpenIMSDK}/Model/OIMQuoteElem.m | 0 .../OpenIMSDK}/Model/OIMSearchParam.h | 0 .../OpenIMSDK}/Model/OIMSearchParam.m | 0 .../OpenIMSDK}/Model/OIMSearchResultInfo.h | 0 .../OpenIMSDK}/Model/OIMSearchResultInfo.m | 0 .../OpenIMSDK}/Model/OIMSimpleRequstInfo.h | 0 .../OpenIMSDK}/Model/OIMSimpleRequstInfo.m | 0 .../OpenIMSDK}/Model/OIMSimpleResultInfo.h | 0 .../OpenIMSDK}/Model/OIMSimpleResultInfo.m | 0 .../OpenIMSDK}/Model/OIMSoundElem.h | 0 .../OpenIMSDK}/Model/OIMSoundElem.m | 0 .../OpenIMSDK}/Model/OIMUpdateFriendsReq.h | 0 .../OpenIMSDK}/Model/OIMUpdateFriendsReq.m | 0 .../OpenIMSDK}/Model/OIMUserInfo.h | 0 .../OpenIMSDK}/Model/OIMUserInfo.m | 0 .../OpenIMSDK}/Model/OIMVideoElem.h | 0 .../OpenIMSDK}/Model/OIMVideoElem.m | 0 {OpenIMSDK => Sources/OpenIMSDK}/OpenIMSDK.h | 0 .../OpenIMSDK}/Utils/OIMDefine.h | 0 .../OpenIMSDK}/Utils/OIMReachability.h | 0 .../OpenIMSDK}/Utils/OIMReachability.m | 0 86 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 Package.resolved rename {OpenIMSDK => Sources/OpenIMSDK}/CallbackProxy/CallbackProxy.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/CallbackProxy/CallbackProxy.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/CallbackProxy/SendMessageCallbackProxy.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/CallbackProxy/SendMessageCallbackProxy.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/CallbackProxy/UploadFileCallbackProxy.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/CallbackProxy/UploadFileCallbackProxy.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Callbacker/OIMCallbacker+Closure.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Callbacker/OIMCallbacker+Closure.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Callbacker/OIMCallbacker.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Callbacker/OIMCallbacker.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Callbacker/OIMGCDMulticastDelegate.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Callbacker/OIMGCDMulticastDelegate.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Connection.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Connection.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Conversation.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Conversation.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Friend.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Friend.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Group.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Group.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Login.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Login.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Message.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+Message.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+User.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager+User.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Interface/OIMManager.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMAtElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMAtElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMAttachedInfoElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMAttachedInfoElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMConversationInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMConversationInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMCustomElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMCustomElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFaceElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFaceElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFileElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFileElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFriendApplication.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFriendApplication.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFullUserInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMFullUserInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMGroupApplicationInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMGroupApplicationInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMGroupInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMGroupInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMGroupMemberInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMGroupMemberInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMLocationElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMLocationElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMMergeElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMMergeElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMMessageElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMMessageElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMMessageInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMMessageInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMNotificationElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMNotificationElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMPictureElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMPictureElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMQuoteElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMQuoteElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSearchParam.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSearchParam.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSearchResultInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSearchResultInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSimpleRequstInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSimpleRequstInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSimpleResultInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSimpleResultInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSoundElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMSoundElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMUpdateFriendsReq.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMUpdateFriendsReq.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMUserInfo.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMUserInfo.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMVideoElem.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Model/OIMVideoElem.m (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/OpenIMSDK.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Utils/OIMDefine.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Utils/OIMReachability.h (100%) rename {OpenIMSDK => Sources/OpenIMSDK}/Utils/OIMReachability.m (100%) diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..74d4e73 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "MJExtension", + "repositoryURL": "https://github.com/CoderMJLee/MJExtension.git", + "state": { + "branch": null, + "revision": "03ceefbcb51be045e0b4d252442a2fb2939d52ae", + "version": "3.4.2" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index f7c2e87..568f796 100644 --- a/Package.swift +++ b/Package.swift @@ -16,48 +16,14 @@ let package = Package( .target( name: "OpenIMSDK", dependencies: [ - "OpenIMSDKCore", - "MJExtension", + "MJExtension" ], - path: "OpenIMSDK", - sources: ["OpenIMSDK.h"], + path: "Sources", publicHeadersPath: ".", cSettings: [ - .headerSearchPath(".") + .headerSearchPath("OpenIMSDK") ] - ), - .target( - name: "OpenIMSDKUtils", - dependencies: [], - path: "OpenIMSDK/Utils" - ), - .target( - name: "OpenIMSDKCallbackProxy", - dependencies: ["OpenIMSDKUtils"], - path: "OpenIMSDK/CallbackProxy" - ), - .target( - name: "OpenIMSDKModel", - dependencies: ["OpenIMSDKUtils"], - path: "OpenIMSDK/Model" - ), - .target( - name: "OpenIMSDKCallbacker", - dependencies: [ - "OpenIMSDKModel", - "OpenIMSDKUtils", - ], - path: "OpenIMSDK/Callbacker" - ), - .target( - name: "OpenIMSDKInterface", - dependencies: [ - "OpenIMSDKModel", - "OpenIMSDKCallbackProxy", - "OpenIMSDKCallbacker", - ], - path: "OpenIMSDK/Interface" - ), + ) ], cxxLanguageStandard: .cxx14 ) diff --git a/OpenIMSDK/CallbackProxy/CallbackProxy.h b/Sources/OpenIMSDK/CallbackProxy/CallbackProxy.h similarity index 100% rename from OpenIMSDK/CallbackProxy/CallbackProxy.h rename to Sources/OpenIMSDK/CallbackProxy/CallbackProxy.h diff --git a/OpenIMSDK/CallbackProxy/CallbackProxy.m b/Sources/OpenIMSDK/CallbackProxy/CallbackProxy.m similarity index 100% rename from OpenIMSDK/CallbackProxy/CallbackProxy.m rename to Sources/OpenIMSDK/CallbackProxy/CallbackProxy.m diff --git a/OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.h b/Sources/OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.h similarity index 100% rename from OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.h rename to Sources/OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.h diff --git a/OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.m b/Sources/OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.m similarity index 100% rename from OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.m rename to Sources/OpenIMSDK/CallbackProxy/SendMessageCallbackProxy.m diff --git a/OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.h b/Sources/OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.h similarity index 100% rename from OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.h rename to Sources/OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.h diff --git a/OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.m b/Sources/OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.m similarity index 100% rename from OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.m rename to Sources/OpenIMSDK/CallbackProxy/UploadFileCallbackProxy.m diff --git a/OpenIMSDK/Callbacker/OIMCallbacker+Closure.h b/Sources/OpenIMSDK/Callbacker/OIMCallbacker+Closure.h similarity index 100% rename from OpenIMSDK/Callbacker/OIMCallbacker+Closure.h rename to Sources/OpenIMSDK/Callbacker/OIMCallbacker+Closure.h diff --git a/OpenIMSDK/Callbacker/OIMCallbacker+Closure.m b/Sources/OpenIMSDK/Callbacker/OIMCallbacker+Closure.m similarity index 100% rename from OpenIMSDK/Callbacker/OIMCallbacker+Closure.m rename to Sources/OpenIMSDK/Callbacker/OIMCallbacker+Closure.m diff --git a/OpenIMSDK/Callbacker/OIMCallbacker.h b/Sources/OpenIMSDK/Callbacker/OIMCallbacker.h similarity index 100% rename from OpenIMSDK/Callbacker/OIMCallbacker.h rename to Sources/OpenIMSDK/Callbacker/OIMCallbacker.h diff --git a/OpenIMSDK/Callbacker/OIMCallbacker.m b/Sources/OpenIMSDK/Callbacker/OIMCallbacker.m similarity index 100% rename from OpenIMSDK/Callbacker/OIMCallbacker.m rename to Sources/OpenIMSDK/Callbacker/OIMCallbacker.m diff --git a/OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.h b/Sources/OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.h similarity index 100% rename from OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.h rename to Sources/OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.h diff --git a/OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.m b/Sources/OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.m similarity index 100% rename from OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.m rename to Sources/OpenIMSDK/Callbacker/OIMGCDMulticastDelegate.m diff --git a/OpenIMSDK/Interface/OIMManager+Connection.h b/Sources/OpenIMSDK/Interface/OIMManager+Connection.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Connection.h rename to Sources/OpenIMSDK/Interface/OIMManager+Connection.h diff --git a/OpenIMSDK/Interface/OIMManager+Connection.m b/Sources/OpenIMSDK/Interface/OIMManager+Connection.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Connection.m rename to Sources/OpenIMSDK/Interface/OIMManager+Connection.m diff --git a/OpenIMSDK/Interface/OIMManager+Conversation.h b/Sources/OpenIMSDK/Interface/OIMManager+Conversation.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Conversation.h rename to Sources/OpenIMSDK/Interface/OIMManager+Conversation.h diff --git a/OpenIMSDK/Interface/OIMManager+Conversation.m b/Sources/OpenIMSDK/Interface/OIMManager+Conversation.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Conversation.m rename to Sources/OpenIMSDK/Interface/OIMManager+Conversation.m diff --git a/OpenIMSDK/Interface/OIMManager+Friend.h b/Sources/OpenIMSDK/Interface/OIMManager+Friend.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Friend.h rename to Sources/OpenIMSDK/Interface/OIMManager+Friend.h diff --git a/OpenIMSDK/Interface/OIMManager+Friend.m b/Sources/OpenIMSDK/Interface/OIMManager+Friend.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Friend.m rename to Sources/OpenIMSDK/Interface/OIMManager+Friend.m diff --git a/OpenIMSDK/Interface/OIMManager+Group.h b/Sources/OpenIMSDK/Interface/OIMManager+Group.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Group.h rename to Sources/OpenIMSDK/Interface/OIMManager+Group.h diff --git a/OpenIMSDK/Interface/OIMManager+Group.m b/Sources/OpenIMSDK/Interface/OIMManager+Group.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Group.m rename to Sources/OpenIMSDK/Interface/OIMManager+Group.m diff --git a/OpenIMSDK/Interface/OIMManager+Login.h b/Sources/OpenIMSDK/Interface/OIMManager+Login.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Login.h rename to Sources/OpenIMSDK/Interface/OIMManager+Login.h diff --git a/OpenIMSDK/Interface/OIMManager+Login.m b/Sources/OpenIMSDK/Interface/OIMManager+Login.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Login.m rename to Sources/OpenIMSDK/Interface/OIMManager+Login.m diff --git a/OpenIMSDK/Interface/OIMManager+Message.h b/Sources/OpenIMSDK/Interface/OIMManager+Message.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Message.h rename to Sources/OpenIMSDK/Interface/OIMManager+Message.h diff --git a/OpenIMSDK/Interface/OIMManager+Message.m b/Sources/OpenIMSDK/Interface/OIMManager+Message.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+Message.m rename to Sources/OpenIMSDK/Interface/OIMManager+Message.m diff --git a/OpenIMSDK/Interface/OIMManager+User.h b/Sources/OpenIMSDK/Interface/OIMManager+User.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager+User.h rename to Sources/OpenIMSDK/Interface/OIMManager+User.h diff --git a/OpenIMSDK/Interface/OIMManager+User.m b/Sources/OpenIMSDK/Interface/OIMManager+User.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager+User.m rename to Sources/OpenIMSDK/Interface/OIMManager+User.m diff --git a/OpenIMSDK/Interface/OIMManager.h b/Sources/OpenIMSDK/Interface/OIMManager.h similarity index 100% rename from OpenIMSDK/Interface/OIMManager.h rename to Sources/OpenIMSDK/Interface/OIMManager.h diff --git a/OpenIMSDK/Interface/OIMManager.m b/Sources/OpenIMSDK/Interface/OIMManager.m similarity index 100% rename from OpenIMSDK/Interface/OIMManager.m rename to Sources/OpenIMSDK/Interface/OIMManager.m diff --git a/OpenIMSDK/Model/OIMAtElem.h b/Sources/OpenIMSDK/Model/OIMAtElem.h similarity index 100% rename from OpenIMSDK/Model/OIMAtElem.h rename to Sources/OpenIMSDK/Model/OIMAtElem.h diff --git a/OpenIMSDK/Model/OIMAtElem.m b/Sources/OpenIMSDK/Model/OIMAtElem.m similarity index 100% rename from OpenIMSDK/Model/OIMAtElem.m rename to Sources/OpenIMSDK/Model/OIMAtElem.m diff --git a/OpenIMSDK/Model/OIMAttachedInfoElem.h b/Sources/OpenIMSDK/Model/OIMAttachedInfoElem.h similarity index 100% rename from OpenIMSDK/Model/OIMAttachedInfoElem.h rename to Sources/OpenIMSDK/Model/OIMAttachedInfoElem.h diff --git a/OpenIMSDK/Model/OIMAttachedInfoElem.m b/Sources/OpenIMSDK/Model/OIMAttachedInfoElem.m similarity index 100% rename from OpenIMSDK/Model/OIMAttachedInfoElem.m rename to Sources/OpenIMSDK/Model/OIMAttachedInfoElem.m diff --git a/OpenIMSDK/Model/OIMConversationInfo.h b/Sources/OpenIMSDK/Model/OIMConversationInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMConversationInfo.h rename to Sources/OpenIMSDK/Model/OIMConversationInfo.h diff --git a/OpenIMSDK/Model/OIMConversationInfo.m b/Sources/OpenIMSDK/Model/OIMConversationInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMConversationInfo.m rename to Sources/OpenIMSDK/Model/OIMConversationInfo.m diff --git a/OpenIMSDK/Model/OIMCustomElem.h b/Sources/OpenIMSDK/Model/OIMCustomElem.h similarity index 100% rename from OpenIMSDK/Model/OIMCustomElem.h rename to Sources/OpenIMSDK/Model/OIMCustomElem.h diff --git a/OpenIMSDK/Model/OIMCustomElem.m b/Sources/OpenIMSDK/Model/OIMCustomElem.m similarity index 100% rename from OpenIMSDK/Model/OIMCustomElem.m rename to Sources/OpenIMSDK/Model/OIMCustomElem.m diff --git a/OpenIMSDK/Model/OIMFaceElem.h b/Sources/OpenIMSDK/Model/OIMFaceElem.h similarity index 100% rename from OpenIMSDK/Model/OIMFaceElem.h rename to Sources/OpenIMSDK/Model/OIMFaceElem.h diff --git a/OpenIMSDK/Model/OIMFaceElem.m b/Sources/OpenIMSDK/Model/OIMFaceElem.m similarity index 100% rename from OpenIMSDK/Model/OIMFaceElem.m rename to Sources/OpenIMSDK/Model/OIMFaceElem.m diff --git a/OpenIMSDK/Model/OIMFileElem.h b/Sources/OpenIMSDK/Model/OIMFileElem.h similarity index 100% rename from OpenIMSDK/Model/OIMFileElem.h rename to Sources/OpenIMSDK/Model/OIMFileElem.h diff --git a/OpenIMSDK/Model/OIMFileElem.m b/Sources/OpenIMSDK/Model/OIMFileElem.m similarity index 100% rename from OpenIMSDK/Model/OIMFileElem.m rename to Sources/OpenIMSDK/Model/OIMFileElem.m diff --git a/OpenIMSDK/Model/OIMFriendApplication.h b/Sources/OpenIMSDK/Model/OIMFriendApplication.h similarity index 100% rename from OpenIMSDK/Model/OIMFriendApplication.h rename to Sources/OpenIMSDK/Model/OIMFriendApplication.h diff --git a/OpenIMSDK/Model/OIMFriendApplication.m b/Sources/OpenIMSDK/Model/OIMFriendApplication.m similarity index 100% rename from OpenIMSDK/Model/OIMFriendApplication.m rename to Sources/OpenIMSDK/Model/OIMFriendApplication.m diff --git a/OpenIMSDK/Model/OIMFullUserInfo.h b/Sources/OpenIMSDK/Model/OIMFullUserInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMFullUserInfo.h rename to Sources/OpenIMSDK/Model/OIMFullUserInfo.h diff --git a/OpenIMSDK/Model/OIMFullUserInfo.m b/Sources/OpenIMSDK/Model/OIMFullUserInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMFullUserInfo.m rename to Sources/OpenIMSDK/Model/OIMFullUserInfo.m diff --git a/OpenIMSDK/Model/OIMGroupApplicationInfo.h b/Sources/OpenIMSDK/Model/OIMGroupApplicationInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMGroupApplicationInfo.h rename to Sources/OpenIMSDK/Model/OIMGroupApplicationInfo.h diff --git a/OpenIMSDK/Model/OIMGroupApplicationInfo.m b/Sources/OpenIMSDK/Model/OIMGroupApplicationInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMGroupApplicationInfo.m rename to Sources/OpenIMSDK/Model/OIMGroupApplicationInfo.m diff --git a/OpenIMSDK/Model/OIMGroupInfo.h b/Sources/OpenIMSDK/Model/OIMGroupInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMGroupInfo.h rename to Sources/OpenIMSDK/Model/OIMGroupInfo.h diff --git a/OpenIMSDK/Model/OIMGroupInfo.m b/Sources/OpenIMSDK/Model/OIMGroupInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMGroupInfo.m rename to Sources/OpenIMSDK/Model/OIMGroupInfo.m diff --git a/OpenIMSDK/Model/OIMGroupMemberInfo.h b/Sources/OpenIMSDK/Model/OIMGroupMemberInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMGroupMemberInfo.h rename to Sources/OpenIMSDK/Model/OIMGroupMemberInfo.h diff --git a/OpenIMSDK/Model/OIMGroupMemberInfo.m b/Sources/OpenIMSDK/Model/OIMGroupMemberInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMGroupMemberInfo.m rename to Sources/OpenIMSDK/Model/OIMGroupMemberInfo.m diff --git a/OpenIMSDK/Model/OIMLocationElem.h b/Sources/OpenIMSDK/Model/OIMLocationElem.h similarity index 100% rename from OpenIMSDK/Model/OIMLocationElem.h rename to Sources/OpenIMSDK/Model/OIMLocationElem.h diff --git a/OpenIMSDK/Model/OIMLocationElem.m b/Sources/OpenIMSDK/Model/OIMLocationElem.m similarity index 100% rename from OpenIMSDK/Model/OIMLocationElem.m rename to Sources/OpenIMSDK/Model/OIMLocationElem.m diff --git a/OpenIMSDK/Model/OIMMergeElem.h b/Sources/OpenIMSDK/Model/OIMMergeElem.h similarity index 100% rename from OpenIMSDK/Model/OIMMergeElem.h rename to Sources/OpenIMSDK/Model/OIMMergeElem.h diff --git a/OpenIMSDK/Model/OIMMergeElem.m b/Sources/OpenIMSDK/Model/OIMMergeElem.m similarity index 100% rename from OpenIMSDK/Model/OIMMergeElem.m rename to Sources/OpenIMSDK/Model/OIMMergeElem.m diff --git a/OpenIMSDK/Model/OIMMessageElem.h b/Sources/OpenIMSDK/Model/OIMMessageElem.h similarity index 100% rename from OpenIMSDK/Model/OIMMessageElem.h rename to Sources/OpenIMSDK/Model/OIMMessageElem.h diff --git a/OpenIMSDK/Model/OIMMessageElem.m b/Sources/OpenIMSDK/Model/OIMMessageElem.m similarity index 100% rename from OpenIMSDK/Model/OIMMessageElem.m rename to Sources/OpenIMSDK/Model/OIMMessageElem.m diff --git a/OpenIMSDK/Model/OIMMessageInfo.h b/Sources/OpenIMSDK/Model/OIMMessageInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMMessageInfo.h rename to Sources/OpenIMSDK/Model/OIMMessageInfo.h diff --git a/OpenIMSDK/Model/OIMMessageInfo.m b/Sources/OpenIMSDK/Model/OIMMessageInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMMessageInfo.m rename to Sources/OpenIMSDK/Model/OIMMessageInfo.m diff --git a/OpenIMSDK/Model/OIMNotificationElem.h b/Sources/OpenIMSDK/Model/OIMNotificationElem.h similarity index 100% rename from OpenIMSDK/Model/OIMNotificationElem.h rename to Sources/OpenIMSDK/Model/OIMNotificationElem.h diff --git a/OpenIMSDK/Model/OIMNotificationElem.m b/Sources/OpenIMSDK/Model/OIMNotificationElem.m similarity index 100% rename from OpenIMSDK/Model/OIMNotificationElem.m rename to Sources/OpenIMSDK/Model/OIMNotificationElem.m diff --git a/OpenIMSDK/Model/OIMPictureElem.h b/Sources/OpenIMSDK/Model/OIMPictureElem.h similarity index 100% rename from OpenIMSDK/Model/OIMPictureElem.h rename to Sources/OpenIMSDK/Model/OIMPictureElem.h diff --git a/OpenIMSDK/Model/OIMPictureElem.m b/Sources/OpenIMSDK/Model/OIMPictureElem.m similarity index 100% rename from OpenIMSDK/Model/OIMPictureElem.m rename to Sources/OpenIMSDK/Model/OIMPictureElem.m diff --git a/OpenIMSDK/Model/OIMQuoteElem.h b/Sources/OpenIMSDK/Model/OIMQuoteElem.h similarity index 100% rename from OpenIMSDK/Model/OIMQuoteElem.h rename to Sources/OpenIMSDK/Model/OIMQuoteElem.h diff --git a/OpenIMSDK/Model/OIMQuoteElem.m b/Sources/OpenIMSDK/Model/OIMQuoteElem.m similarity index 100% rename from OpenIMSDK/Model/OIMQuoteElem.m rename to Sources/OpenIMSDK/Model/OIMQuoteElem.m diff --git a/OpenIMSDK/Model/OIMSearchParam.h b/Sources/OpenIMSDK/Model/OIMSearchParam.h similarity index 100% rename from OpenIMSDK/Model/OIMSearchParam.h rename to Sources/OpenIMSDK/Model/OIMSearchParam.h diff --git a/OpenIMSDK/Model/OIMSearchParam.m b/Sources/OpenIMSDK/Model/OIMSearchParam.m similarity index 100% rename from OpenIMSDK/Model/OIMSearchParam.m rename to Sources/OpenIMSDK/Model/OIMSearchParam.m diff --git a/OpenIMSDK/Model/OIMSearchResultInfo.h b/Sources/OpenIMSDK/Model/OIMSearchResultInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMSearchResultInfo.h rename to Sources/OpenIMSDK/Model/OIMSearchResultInfo.h diff --git a/OpenIMSDK/Model/OIMSearchResultInfo.m b/Sources/OpenIMSDK/Model/OIMSearchResultInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMSearchResultInfo.m rename to Sources/OpenIMSDK/Model/OIMSearchResultInfo.m diff --git a/OpenIMSDK/Model/OIMSimpleRequstInfo.h b/Sources/OpenIMSDK/Model/OIMSimpleRequstInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMSimpleRequstInfo.h rename to Sources/OpenIMSDK/Model/OIMSimpleRequstInfo.h diff --git a/OpenIMSDK/Model/OIMSimpleRequstInfo.m b/Sources/OpenIMSDK/Model/OIMSimpleRequstInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMSimpleRequstInfo.m rename to Sources/OpenIMSDK/Model/OIMSimpleRequstInfo.m diff --git a/OpenIMSDK/Model/OIMSimpleResultInfo.h b/Sources/OpenIMSDK/Model/OIMSimpleResultInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMSimpleResultInfo.h rename to Sources/OpenIMSDK/Model/OIMSimpleResultInfo.h diff --git a/OpenIMSDK/Model/OIMSimpleResultInfo.m b/Sources/OpenIMSDK/Model/OIMSimpleResultInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMSimpleResultInfo.m rename to Sources/OpenIMSDK/Model/OIMSimpleResultInfo.m diff --git a/OpenIMSDK/Model/OIMSoundElem.h b/Sources/OpenIMSDK/Model/OIMSoundElem.h similarity index 100% rename from OpenIMSDK/Model/OIMSoundElem.h rename to Sources/OpenIMSDK/Model/OIMSoundElem.h diff --git a/OpenIMSDK/Model/OIMSoundElem.m b/Sources/OpenIMSDK/Model/OIMSoundElem.m similarity index 100% rename from OpenIMSDK/Model/OIMSoundElem.m rename to Sources/OpenIMSDK/Model/OIMSoundElem.m diff --git a/OpenIMSDK/Model/OIMUpdateFriendsReq.h b/Sources/OpenIMSDK/Model/OIMUpdateFriendsReq.h similarity index 100% rename from OpenIMSDK/Model/OIMUpdateFriendsReq.h rename to Sources/OpenIMSDK/Model/OIMUpdateFriendsReq.h diff --git a/OpenIMSDK/Model/OIMUpdateFriendsReq.m b/Sources/OpenIMSDK/Model/OIMUpdateFriendsReq.m similarity index 100% rename from OpenIMSDK/Model/OIMUpdateFriendsReq.m rename to Sources/OpenIMSDK/Model/OIMUpdateFriendsReq.m diff --git a/OpenIMSDK/Model/OIMUserInfo.h b/Sources/OpenIMSDK/Model/OIMUserInfo.h similarity index 100% rename from OpenIMSDK/Model/OIMUserInfo.h rename to Sources/OpenIMSDK/Model/OIMUserInfo.h diff --git a/OpenIMSDK/Model/OIMUserInfo.m b/Sources/OpenIMSDK/Model/OIMUserInfo.m similarity index 100% rename from OpenIMSDK/Model/OIMUserInfo.m rename to Sources/OpenIMSDK/Model/OIMUserInfo.m diff --git a/OpenIMSDK/Model/OIMVideoElem.h b/Sources/OpenIMSDK/Model/OIMVideoElem.h similarity index 100% rename from OpenIMSDK/Model/OIMVideoElem.h rename to Sources/OpenIMSDK/Model/OIMVideoElem.h diff --git a/OpenIMSDK/Model/OIMVideoElem.m b/Sources/OpenIMSDK/Model/OIMVideoElem.m similarity index 100% rename from OpenIMSDK/Model/OIMVideoElem.m rename to Sources/OpenIMSDK/Model/OIMVideoElem.m diff --git a/OpenIMSDK/OpenIMSDK.h b/Sources/OpenIMSDK/OpenIMSDK.h similarity index 100% rename from OpenIMSDK/OpenIMSDK.h rename to Sources/OpenIMSDK/OpenIMSDK.h diff --git a/OpenIMSDK/Utils/OIMDefine.h b/Sources/OpenIMSDK/Utils/OIMDefine.h similarity index 100% rename from OpenIMSDK/Utils/OIMDefine.h rename to Sources/OpenIMSDK/Utils/OIMDefine.h diff --git a/OpenIMSDK/Utils/OIMReachability.h b/Sources/OpenIMSDK/Utils/OIMReachability.h similarity index 100% rename from OpenIMSDK/Utils/OIMReachability.h rename to Sources/OpenIMSDK/Utils/OIMReachability.h diff --git a/OpenIMSDK/Utils/OIMReachability.m b/Sources/OpenIMSDK/Utils/OIMReachability.m similarity index 100% rename from OpenIMSDK/Utils/OIMReachability.m rename to Sources/OpenIMSDK/Utils/OIMReachability.m From 7b43410a94264b0ef43396d0165028f00554561a Mon Sep 17 00:00:00 2001 From: Rocket Jerry Date: Fri, 17 Jan 2025 19:40:55 +0800 Subject: [PATCH 07/14] Update Package.swift --- Package.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Package.swift b/Package.swift index 568f796..9454792 100644 --- a/Package.swift +++ b/Package.swift @@ -10,12 +10,14 @@ let package = Package( .library(name: "OpenIMSDK", targets: ["OpenIMSDK"]) ], dependencies: [ + .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", from: "1.0.1"), .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0"), ], targets: [ .target( name: "OpenIMSDK", dependencies: [ + "OpenIMSDK", "MJExtension" ], path: "Sources", From 6451afb61671553d1781b65bafea77f138353e1c Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Fri, 17 Jan 2025 22:34:25 +0800 Subject: [PATCH 08/14] Update Package.swift --- Package.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9454792..18a7c17 100644 --- a/Package.swift +++ b/Package.swift @@ -10,14 +10,13 @@ let package = Package( .library(name: "OpenIMSDK", targets: ["OpenIMSDK"]) ], dependencies: [ - .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", from: "1.0.1"), + .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", from: "1.0.2"), .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0"), ], targets: [ .target( name: "OpenIMSDK", dependencies: [ - "OpenIMSDK", "MJExtension" ], path: "Sources", From 824d60ea4346b05cd77f43f8cf6bc7dc19884c96 Mon Sep 17 00:00:00 2001 From: Jerry Ye Date: Fri, 17 Jan 2025 22:38:42 +0800 Subject: [PATCH 09/14] Update --- Package.swift | 3 +-- README.md | 12 ++++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 18a7c17..7fe13fb 100644 --- a/Package.swift +++ b/Package.swift @@ -10,8 +10,7 @@ let package = Package( .library(name: "OpenIMSDK", targets: ["OpenIMSDK"]) ], dependencies: [ - .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", from: "1.0.2"), - .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0"), + .package(url: "https://github.com/CoderMJLee/MJExtension.git", from: "3.0.0") ], targets: [ .target( diff --git a/README.md b/README.md index 05d77c8..490faad 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,16 @@ For the SDK reference, see [Quick Start guide](https://docs.openim.io/sdks/quick ### Adding Dependencies -```ruby -pod 'OpenIMSDK' +```swift +// swift-tools-version:5.5 +import PackageDescription + +let package = Package( + name: "YOUR_PROJECT_NAME", + dependencies: [ + .package(url: "https://github.com/bc1pjerry/open-im-sdk-ios.git", from: "4.0.0"), + ] +) ``` ## Usage 🚀 From 22b7a51abcfc5f7b37e81fe1b632bbe924a70278 Mon Sep 17 00:00:00 2001 From: Rocket Jerry Date: Sat, 18 Jan 2025 22:01:54 +0800 Subject: [PATCH 10/14] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 7fe13fb..b06b009 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,7 @@ let package = Package( path: "Sources", publicHeadersPath: ".", cSettings: [ - .headerSearchPath("OpenIMSDK") + .headerSearchPath(".") ] ) ], From 69641f9878fd0026421a8f54a5efb63cc9eb6f8e Mon Sep 17 00:00:00 2001 From: Rocket Jerry Date: Sat, 18 Jan 2025 22:09:21 +0800 Subject: [PATCH 11/14] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b06b009..f1da608 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( dependencies: [ "MJExtension" ], - path: "Sources", + path: "Sources/OpenIMSDK", publicHeadersPath: ".", cSettings: [ .headerSearchPath(".") From 7b44217cf8e17100be1506fdd18346491874f50a Mon Sep 17 00:00:00 2001 From: Rocket Jerry Date: Sat, 18 Jan 2025 22:16:58 +0800 Subject: [PATCH 12/14] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index f1da608..b06b009 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( dependencies: [ "MJExtension" ], - path: "Sources/OpenIMSDK", + path: "Sources", publicHeadersPath: ".", cSettings: [ .headerSearchPath(".") From fa2403bde3c87fb118befdfe0fd3181bee91dcbf Mon Sep 17 00:00:00 2001 From: Rocket Jerry Date: Sat, 18 Jan 2025 22:24:56 +0800 Subject: [PATCH 13/14] Update ignore file and podfile --- .gitignore | 1 + OpenIMSDK.podspec | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8c9d5d3..8b49d68 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ profile DerivedData *.hmap *.ipa +Package.resolved # Generated files VersionX-revision.h diff --git a/OpenIMSDK.podspec b/OpenIMSDK.podspec index 8eba77b..dfae831 100644 --- a/OpenIMSDK.podspec +++ b/OpenIMSDK.podspec @@ -28,23 +28,23 @@ Pod::Spec.new do |s| s.ios.deployment_target = '11.0' - s.source_files = 'OpenIMSDK/OpenIMSDK.{h,m}' + s.source_files = 'Sources/OpenIMSDK/OpenIMSDK.{h,m}' s.subspec 'Utils' do |ss| - ss.source_files = 'OpenIMSDK/Utils/*.{h,m}' + ss.source_files = 'Sources/OpenIMSDK/Utils/*.{h,m}' end s.subspec 'CallbackProxy' do |ss| ss.dependency 'OpenIMSDK/Utils' - ss.source_files = 'OpenIMSDK/CallbackProxy/*.{h,m}' + ss.source_files = 'Sources/OpenIMSDK/CallbackProxy/*.{h,m}' end s.subspec 'Model' do |ss| ss.dependency 'OpenIMSDK/Utils' - ss.source_files = 'OpenIMSDK/Model/*.{h,m}' + ss.source_files = 'Sources/OpenIMSDK/Model/*.{h,m}' end s.subspec 'Interface' do |ss| @@ -52,14 +52,14 @@ Pod::Spec.new do |s| ss.dependency 'OpenIMSDK/CallbackProxy' ss.dependency 'OpenIMSDK/Callbacker' - ss.source_files = 'OpenIMSDK/Interface/*.{h,m}' + ss.source_files = 'Sources/OpenIMSDK/Interface/*.{h,m}' end s.subspec 'Callbacker' do |ss| ss.dependency 'OpenIMSDK/Model' ss.dependency 'OpenIMSDK/Utils' - ss.source_files = 'OpenIMSDK/Callbacker/*.{h,m}' + ss.source_files = 'Sources/OpenIMSDK/Callbacker/*.{h,m}' end valid_archs = ['armv7s','arm64','x86_64'] From 622f7dbd3aed664294307e03ac88d6f119eadeef Mon Sep 17 00:00:00 2001 From: Rocket Jerry <32982019+bc1pjerry@users.noreply.github.com> Date: Sat, 18 Jan 2025 22:25:48 +0800 Subject: [PATCH 14/14] Delete Package.resolved --- Package.resolved | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 74d4e73..0000000 --- a/Package.resolved +++ /dev/null @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "MJExtension", - "repositoryURL": "https://github.com/CoderMJLee/MJExtension.git", - "state": { - "branch": null, - "revision": "03ceefbcb51be045e0b4d252442a2fb2939d52ae", - "version": "3.4.2" - } - } - ] - }, - "version": 1 -}