From 7e0b21ba269c7826dc91cdf89195649cc8054686 Mon Sep 17 00:00:00 2001 From: Ben Smiley Date: Tue, 27 Jul 2021 13:17:30 +0200 Subject: [PATCH] Update podspec --- ChatK!t.podspec | 11 ++++++----- ChatK!t/Core/ChatModel.swift | 6 ------ ChatSDK.podspec | 6 +++--- ChatSDKCore/Classes/Convenience/BModuleHelper.h | 1 + ChatSDKCore/Classes/Convenience/BModuleHelper.m | 5 ++++- ChatSDKCore/Classes/Session/BChatSDK.m | 10 +++++++--- ChatSDKFirebase.podspec | 2 +- tag.sh | 2 +- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ChatK!t.podspec b/ChatK!t.podspec index d34cc642..4909d9dc 100755 --- a/ChatK!t.podspec +++ b/ChatK!t.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ChatK!t" - s.version = "5.0.6" + s.version = "5.0.7" s.summary = "ChatK!t - Message View" s.homepage = "https://chatk.it" s.license = { :type => 'Apache 2.0' } @@ -11,10 +11,10 @@ Pod::Spec.new do |s| s.platform = :ios, '13.0' s.requires_arc = true s.swift_version = "5.0" - s.default_subspec = 'ChatKit' + s.default_subspec = 'ChatK!t' # s.static_framework = true - s.subspec 'ChatKit' do |s| + s.subspec 'ChatK!t' do |s| s.source_files = "ChatK!t/Core/**/*.{h,m,swift}" @@ -27,7 +27,8 @@ Pod::Spec.new do |s| s.dependency 'MZDownloadManager' s.dependency 'FLAnimatedImage' s.dependency 'GSImageViewerController' - s.dependency 'RxSwift' + # s.dependency 'RxSwift' + s.dependency 'RxSwift', '~>6.0.0' s.dependency 'DateTools' s.dependency 'SDWebImage', '~> 5.0' @@ -36,7 +37,7 @@ Pod::Spec.new do |s| s.subspec 'ChatSDK' do |s| s.source_files = ['ChatK!t/ChatSDK/**/*'] s.dependency 'ChatSDK/Core' - s.dependency 'ChatKit' + s.dependency 'ChatK!t/ChatK!t' end end \ No newline at end of file diff --git a/ChatK!t/Core/ChatModel.swift b/ChatK!t/Core/ChatModel.swift index a56561d9..2b694f82 100644 --- a/ChatK!t/Core/ChatModel.swift +++ b/ChatK!t/Core/ChatModel.swift @@ -8,12 +8,6 @@ import Foundation import RxSwift -//public protocol ChatModelDelegate: MessagesModelDelegate { -// var model: ChatModel? { -// get set -// } -//} - open class ChatModel: ChatToolbarActionsDelegate { public let thread: Thread diff --git a/ChatSDK.podspec b/ChatSDK.podspec index 7ed120d7..5a114ff2 100755 --- a/ChatSDK.podspec +++ b/ChatSDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ChatSDK" - s.version = "5.0.6" + s.version = "5.0.7" s.summary = "Chat SDK - Mobile messaging framework for iOS" s.homepage = "https://sdk.chat" s.license = { :type => 'Chat SDK License', :file => 'LICENSE.md' } @@ -38,8 +38,8 @@ Pod::Spec.new do |s| s.dependency 'DateTools', '~> 2.0' s.dependency 'SAMKeychain' - s.dependency 'RxSwift', '6.0.0-rc.1' - s.dependency 'RxCocoa', '6.0.0-rc.1' + s.dependency 'RxSwift', '~>6.0.0' + s.dependency 'RxCocoa', '~>6.0.0' s.frameworks = 'SafariServices' diff --git a/ChatSDKCore/Classes/Convenience/BModuleHelper.h b/ChatSDKCore/Classes/Convenience/BModuleHelper.h index 669a5627..c6802de0 100755 --- a/ChatSDKCore/Classes/Convenience/BModuleHelper.h +++ b/ChatSDKCore/Classes/Convenience/BModuleHelper.h @@ -12,5 +12,6 @@ // Acivate the core Chat SDK modules -(void) activateCoreModules; +-(void) activateUIModule; @end diff --git a/ChatSDKCore/Classes/Convenience/BModuleHelper.m b/ChatSDKCore/Classes/Convenience/BModuleHelper.m index 17969575..efd502c4 100755 --- a/ChatSDKCore/Classes/Convenience/BModuleHelper.m +++ b/ChatSDKCore/Classes/Convenience/BModuleHelper.m @@ -16,8 +16,11 @@ -(instancetype) init { return self; } --(void) activateCoreModules { +-(void) activateUIModule { [self activateModuleForName:@"BDefaultUIModule"]; +} + +-(void) activateCoreModules { [self activateModuleForName:@"BCoreDataStorageModule"]; [self activateModuleForName:@"BReachabilityModule"]; } diff --git a/ChatSDKCore/Classes/Session/BChatSDK.m b/ChatSDKCore/Classes/Session/BChatSDK.m index 3b760c5a..1c6be8b8 100755 --- a/ChatSDKCore/Classes/Session/BChatSDK.m +++ b/ChatSDKCore/Classes/Session/BChatSDK.m @@ -90,9 +90,7 @@ -(void) activateLicense: (NSString *) provider identifier: (NSString *) identifi -(void) initialize: (BConfiguration *) config app:(UIApplication *)application options:(NSDictionary *)launchOptions modules: (NSArray *) modules networkAdapter:(id)networkAdapter interfaceAdapter:(id)interfaceAdapter { _configuration = config; - - [_moduleHelper activateCoreModules]; - + if(interfaceAdapter) { _interfaceAdapter = interfaceAdapter; } @@ -109,6 +107,12 @@ -(void) initialize: (BConfiguration *) config app:(UIApplication *)application o _interfaceAdapter = [((id) module) getInterfaceAdapter]; } } + + if (!_interfaceAdapter) { + [_moduleHelper activateUIModule]; + } + + [_moduleHelper activateCoreModules]; for (id module in modules) { [module activate]; diff --git a/ChatSDKFirebase.podspec b/ChatSDKFirebase.podspec index 1d8e972b..bdea177d 100755 --- a/ChatSDKFirebase.podspec +++ b/ChatSDKFirebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ChatSDKFirebase" - s.version = "5.0.6" + s.version = "5.0.7" s.summary = "Chat SDK - Mobile messaging framework for iOS" s.homepage = "https://sdk.chat" s.license = { :type => 'Chat SDK License', :file => 'LICENSE.md' } diff --git a/tag.sh b/tag.sh index 6cb7e1e7..8549ed6b 100644 --- a/tag.sh +++ b/tag.sh @@ -3,6 +3,6 @@ git add --all git commit -m "Update podspec" git push origin master -git tag 5.0.5 +git tag 5.0.6 git push --tags pod trunk push --allow-warnings ChatK\!t.podspec \ No newline at end of file