Skip to content

Commit

Permalink
Update podspec
Browse files Browse the repository at this point in the history
  • Loading branch information
bensmiley committed Jul 27, 2021
1 parent b0902e8 commit 7e0b21b
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 20 deletions.
11 changes: 6 additions & 5 deletions 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' }
Expand All @@ -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}"

Expand All @@ -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'

Expand All @@ -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
6 changes: 0 additions & 6 deletions ChatK!t/Core/ChatModel.swift
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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' }
Expand Down Expand Up @@ -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'

Expand Down
1 change: 1 addition & 0 deletions ChatSDKCore/Classes/Convenience/BModuleHelper.h
Expand Up @@ -12,5 +12,6 @@

// Acivate the core Chat SDK modules
-(void) activateCoreModules;
-(void) activateUIModule;

@end
5 changes: 4 additions & 1 deletion ChatSDKCore/Classes/Convenience/BModuleHelper.m
Expand Up @@ -16,8 +16,11 @@ -(instancetype) init {
return self;
}

-(void) activateCoreModules {
-(void) activateUIModule {
[self activateModuleForName:@"BDefaultUIModule"];
}

-(void) activateCoreModules {
[self activateModuleForName:@"BCoreDataStorageModule"];
[self activateModuleForName:@"BReachabilityModule"];
}
Expand Down
10 changes: 7 additions & 3 deletions ChatSDKCore/Classes/Session/BChatSDK.m
Expand Up @@ -90,9 +90,7 @@ -(void) activateLicense: (NSString *) provider identifier: (NSString *) identifi
-(void) initialize: (BConfiguration *) config app:(UIApplication *)application options:(NSDictionary *)launchOptions modules: (NSArray<PModule> *) modules networkAdapter:(id<PNetworkAdapter>)networkAdapter interfaceAdapter:(id<PInterfaceAdapter>)interfaceAdapter {

_configuration = config;

[_moduleHelper activateCoreModules];


if(interfaceAdapter) {
_interfaceAdapter = interfaceAdapter;
}
Expand All @@ -109,6 +107,12 @@ -(void) initialize: (BConfiguration *) config app:(UIApplication *)application o
_interfaceAdapter = [((id<PInterfaceAdapterProvider>) module) getInterfaceAdapter];
}
}

if (!_interfaceAdapter) {
[_moduleHelper activateUIModule];
}

[_moduleHelper activateCoreModules];

for (id<PModule> module in modules) {
[module activate];
Expand Down
2 changes: 1 addition & 1 deletion 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' }
Expand Down
2 changes: 1 addition & 1 deletion tag.sh
Expand Up @@ -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

0 comments on commit 7e0b21b

Please sign in to comment.