Merge pull request #102 from channel-io/develop

0.7.10

Author: zoyi-jin

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.7.10
+
+## Update
+* Update RNChannelIO
+  * changed deployment target 10 -> 11
+  * changed dependency: "ChannelIOSDK", '~> 10'
+
+## Bug Fixes
+* Fixes an issue where both memberId and userId are omitted when using memberId and userId at the same time.
+
 # 0.7.9
 
 ## Update

RNChannelIO.podspec

@@ -1,19 +1,19 @@
 Pod::Spec.new do |s|
   s.name         = "RNChannelIO"
-  s.version      = "0.1.0"
+  s.version      = "0.1.1"
   s.summary      = "RNChannelIO"
   s.description  = "channel plugin for react native"
   s.homepage     = "https://channel.io"
   s.license      = { :type => "SDK", :file => "LICENSE" }
-  s.author       = { 'Channel Corp.' => 'eng@channel.io', 'Jam' => 'jam@channel.io', 'Jin' => 'jin@channel.io' }
-  s.platform     = :ios, "10.0"
+  s.author       = { 'Channel Corp.' => 'eng@channel.io', 'Channel Corp. iOS' => 'ios@channel.io' }
+  s.platform     = :ios, "11.0"
   s.source       = { :git => "https://github.com/zoyi/react-native-channel-io.git" }
   s.source_files = "ios/**/*.{h,m}"
   s.requires_arc = true
   s.swift_version = '5.0'
 
-  s.ios.deployment_target = '10.0'
+  s.ios.deployment_target = '11.0'
 
   s.dependency "React"
-  s.dependency "ChannelIOSDK"
+  s.dependency "ChannelIOSDK", '~> 10'
 end

ios/RCTConvert+ChannelIO.m

@@ -76,15 +76,15 @@ + (BootConfig *)bootConfig:(id)json {
     [config setWithUnsubscribeTexting: [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_TEXTING]]];
   }
 
-  if (json[KEY_LAUNCHER_CONFIG] == nil && json[KEY_CHANNEL_BUTTON_OPTION] != nil) {
+  if (json[KEY_CHANNEL_BUTTON_OPTION] != nil) {
     config.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_CHANNEL_BUTTON_OPTION]];
-  } else if (json[KEY_LAUNCHER_CONFIG] != nil && json[KEY_CHANNEL_BUTTON_OPTION] == nil) {
+  } else if (json[KEY_LAUNCHER_CONFIG] != nil) {
     config.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_LAUNCHER_CONFIG]];
   }
 
-  if (json[KEY_MEMBER_ID] != nil && json[KEY_USER_ID] == nil) {
+  if (json[KEY_MEMBER_ID] != nil) {
     config.memberId = [RCTConvert NSString:json[KEY_MEMBER_ID]];
-  } else if (json[KEY_MEMBER_ID] == nil && json[KEY_USER_ID] != nil) {
+  } else if (json[KEY_USER_ID] != nil) {
     config.memberId = [RCTConvert NSString:json[KEY_USER_ID]];
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-channel-plugin",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "react native module for channel io",
   "main": "index.js",
   "scripts": {