From 0ae33218d150f4e85510ab570795d1d76870ca5b Mon Sep 17 00:00:00 2001 From: Matthew Callis Date: Tue, 5 Nov 2019 13:42:19 -0800 Subject: [PATCH 1/5] Add podspec file to included bundled files --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 58c0f71..b07e36a 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "android", "ios", "js", + "apptentive-react-native.podspec", "LICENSE" ], "keywords": [ From e62231b25555895f65d1e3b39fb7c4be51f9192c Mon Sep 17 00:00:00 2001 From: Alex Lementuev Date: Tue, 5 Nov 2019 13:51:30 -0800 Subject: [PATCH 2/5] Bumped SKD version to 5.4.6 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7303c81..e52a858 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ This document lets you know what has changed in the React Native module. For cha - [Android Changelog](https://github.com/apptentive/apptentive-android/blob/master/CHANGELOG.md) - [iOS Changelog](https://github.com/apptentive/apptentive-ios/blob/master/CHANGELOG.md) +# 2019-11-05 - v5.4.6 + +- Fixed `podspec` file for 0.60-style auto-linking. +- Apptentive Android SDK: 5.4.7 +- Apptentive iOS SDK: 5.2.7 + # 2019-11-05 - v5.4.5 - Added `podspec` file and updated iOS header path for 0.60-style auto-linking. diff --git a/package.json b/package.json index b07e36a..a083edb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apptentive-react-native", - "version": "5.4.5", + "version": "5.4.6", "description": "React Native Module for Apptentive SDK", "main": "js/index.js", "types": "js/index.d.ts", From 8a663abb30eece45bfdf35d62b409d531a855547 Mon Sep 17 00:00:00 2001 From: Alex Lementuev Date: Tue, 5 Nov 2019 13:57:47 -0800 Subject: [PATCH 3/5] Updated files for 5.4.6 release --- android/src/main/res/values/strings.xml | 2 +- ios/RNApptentiveModule.m | 2 +- sample/ios/Podfile.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 1ecdbfa..290445e 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ React Native - 5.4.5 + 5.4.6 diff --git a/ios/RNApptentiveModule.m b/ios/RNApptentiveModule.m index 44f4280..88447fe 100644 --- a/ios/RNApptentiveModule.m +++ b/ios/RNApptentiveModule.m @@ -52,7 +52,7 @@ - (dispatch_queue_t)methodQueue if (configuration) { configuration.appID = configurationDictionary[@"appleID"]; configuration.distributionName = @"React Native"; - configuration.distributionVersion = @"5.4.5"; + configuration.distributionVersion = @"5.4.6"; [Apptentive registerWithConfiguration:configuration]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageCenterUnreadCountChangedNotification:) name:ApptentiveMessageCenterUnreadCountChangedNotification object:nil]; diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index b397ee6..a6f9a3c 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -5,7 +5,7 @@ DEPENDENCIES: - apptentive-ios (= 5.2.7) SPEC REPOS: - https://github.com/CocoaPods/Specs.git: + https://github.com/cocoapods/specs.git: - apptentive-ios SPEC CHECKSUMS: @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3b112418f2faa6ed3cde7a7ee73502794a46f47c -COCOAPODS: 1.8.0 +COCOAPODS: 1.5.3 From 5b49b55a919085da8fc05972d3b3fe7b1139c29a Mon Sep 17 00:00:00 2001 From: Matthew Callis Date: Tue, 5 Nov 2019 14:45:07 -0800 Subject: [PATCH 4/5] Fix number types for device custom data --- js/index.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/js/index.js b/js/index.js index 2ed0c73..da751c4 100644 --- a/js/index.js +++ b/js/index.js @@ -11,6 +11,7 @@ export class ApptentiveConfiguration { this.shouldSanitizeLogMessages = true; this.shouldEncryptStorage = false; } + toString() { return `(apptentiveKey=${this.apptentiveKey}, apptentiveSignature=${this.apptentiveSignature}, logLevel=${this.logLevel}, shouldSanitizeLogMessages=${this.shouldSanitizeLogMessages}, shouldEncryptStorage=${this.shouldEncryptStorage})`; } @@ -130,9 +131,11 @@ export class Apptentive { const type = typeof value; if (type === 'string') { return RNApptentiveModule.addCustomPersonDataString(key, value); - } else if (type === 'number') { + } + if (type === 'number') { return RNApptentiveModule.addCustomPersonDataNumber(key, ApptentivePlatformSpecific.exportNumber(value)); - } else if (type === 'boolean') { + } + if (type === 'boolean') { return RNApptentiveModule.addCustomPersonDataBool(key, value); } } @@ -159,9 +162,11 @@ export class Apptentive { const type = typeof value; if (type === 'string') { return RNApptentiveModule.addCustomDeviceDataString(key, value); - } else if (type === 'number') { - return RNApptentiveModule.addCustomDeviceDataNumber(key, value); - } else if (type === 'boolean') { + } + if (type === 'number') { + return RNApptentiveModule.addCustomDeviceDataNumber(key, ApptentivePlatformSpecific.exportNumber(value)); + } + if (type === 'boolean') { return RNApptentiveModule.addCustomDeviceDataBool(key, value); } } From 0de63b0c5fd3ab3e8f4593c2ce6cde4984e67054 Mon Sep 17 00:00:00 2001 From: Frank Schmitt Date: Thu, 7 Nov 2019 12:02:24 -0800 Subject: [PATCH 5/5] Updated files for 5.4.6 release --- apptentive-react-native.podspec | 2 +- sample/ios/Podfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apptentive-react-native.podspec b/apptentive-react-native.podspec index 5839d00..cd5f83e 100644 --- a/apptentive-react-native.podspec +++ b/apptentive-react-native.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "apptentive-react-native" - s.version = "5.4.4" + s.version = '5.4.6' s.summary = "Apptentive SDK module for React Native" s.description = <<-DESC diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index a6f9a3c..b397ee6 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -5,7 +5,7 @@ DEPENDENCIES: - apptentive-ios (= 5.2.7) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - apptentive-ios SPEC CHECKSUMS: @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3b112418f2faa6ed3cde7a7ee73502794a46f47c -COCOAPODS: 1.5.3 +COCOAPODS: 1.8.0