diff --git a/AppboyProject/android/app/build.gradle b/AppboyProject/android/app/build.gradle index 1a23447..d0e5803 100644 --- a/AppboyProject/android/app/build.gradle +++ b/AppboyProject/android/app/build.gradle @@ -146,9 +146,9 @@ def jscFlavor = 'org.webkit:android-jsc:+' def enableHermes = project.ext.react.get("enableHermes", false) dependencies { - implementation "com.google.firebase:firebase-messaging:20.3.0" + implementation "com.google.firebase:firebase-messaging:22.0.0" implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation "com.facebook.react:react-native:+" // From node_modules if (enableHermes) { // For RN 0.60.x @@ -169,4 +169,4 @@ task copyDownloadableDepsToLibs(type: Copy) { into 'libs' } -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) \ No newline at end of file +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/AppboyProject/android/app/google-services.json b/AppboyProject/android/app/google-services.json index 7d15c54..1882249 100644 --- a/AppboyProject/android/app/google-services.json +++ b/AppboyProject/android/app/google-services.json @@ -1,21 +1,20 @@ { "project_info": { - "project_number": "354899208806", - "firebase_url": "https://appboyproject-react.firebaseio.com", - "project_id": "appboyproject-react", - "storage_bucket": "appboyproject-react.appspot.com" + "project_number": "531790618696", + "project_id": "android-react-sample-app", + "storage_bucket": "android-react-sample-app.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:354899208806:android:22e79902e0a56e7c", + "mobilesdk_app_id": "1:531790618696:android:18f24c0f9c5b8c58f9f87d", "android_client_info": { "package_name": "com.appboyproject" } }, "oauth_client": [ { - "client_id": "354899208806-9gu0k6r40sb336pbg3u5933ocvkt000l.apps.googleusercontent.com", + "client_id": "531790618696-d9deirj22dfprlbp12l8pkd405cccpm4.apps.googleusercontent.com", "client_type": 3 } ], @@ -25,15 +24,13 @@ } ], "services": { - "analytics_service": { - "status": 1 - }, "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 + "other_platform_oauth_client": [ + { + "client_id": "531790618696-d9deirj22dfprlbp12l8pkd405cccpm4.apps.googleusercontent.com", + "client_type": 3 + } + ] } } } diff --git a/AppboyProject/android/app/src/main/res/values/braze.xml b/AppboyProject/android/app/src/main/res/values/braze.xml index 9746d75..2cacd7c 100644 --- a/AppboyProject/android/app/src/main/res/values/braze.xml +++ b/AppboyProject/android/app/src/main/res/values/braze.xml @@ -6,12 +6,7 @@ STAGING true - 901477453852 - - - - true + 531790618696 true diff --git a/AppboyProject/ios/Podfile.lock b/AppboyProject/ios/Podfile.lock index f7a983f..337e0ec 100644 --- a/AppboyProject/ios/Podfile.lock +++ b/AppboyProject/ios/Podfile.lock @@ -1,17 +1,17 @@ PODS: - - Appboy-iOS-SDK (4.2.0): - - Appboy-iOS-SDK/UI (= 4.2.0) - - Appboy-iOS-SDK/ContentCards (4.2.0): + - Appboy-iOS-SDK (4.3.0): + - Appboy-iOS-SDK/UI (= 4.3.0) + - Appboy-iOS-SDK/ContentCards (4.3.0): - Appboy-iOS-SDK/Core - SDWebImage (< 6, >= 5.8.2) - - Appboy-iOS-SDK/Core (4.2.0) - - Appboy-iOS-SDK/InAppMessage (4.2.0): + - Appboy-iOS-SDK/Core (4.3.0) + - Appboy-iOS-SDK/InAppMessage (4.3.0): - Appboy-iOS-SDK/Core - SDWebImage (< 6, >= 5.8.2) - - Appboy-iOS-SDK/NewsFeed (4.2.0): + - Appboy-iOS-SDK/NewsFeed (4.3.0): - Appboy-iOS-SDK/Core - SDWebImage (< 6, >= 5.8.2) - - Appboy-iOS-SDK/UI (4.2.0): + - Appboy-iOS-SDK/UI (4.3.0): - Appboy-iOS-SDK/ContentCards - Appboy-iOS-SDK/Core - Appboy-iOS-SDK/InAppMessage @@ -199,8 +199,8 @@ PODS: - React-cxxreact (= 0.61.5) - React-jsi (= 0.61.5) - React-jsinspector (0.61.5) - - react-native-appboy-sdk (1.29.1): - - Appboy-iOS-SDK (~> 4.2.0) + - react-native-appboy-sdk (1.30.0): + - Appboy-iOS-SDK (~> 4.3.0) - React - React-RCTActionSheet (0.61.5): - React-Core/RCTActionSheetHeaders (= 0.61.5) @@ -334,7 +334,7 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Appboy-iOS-SDK: 3c3e75a932427d5f443062c130f8799885a85313 + Appboy-iOS-SDK: dade18b2f6dc5c058669367c558ed87f389e4eea boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f @@ -350,7 +350,7 @@ SPEC CHECKSUMS: React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7 React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386 React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0 - react-native-appboy-sdk: 56dca097c248e752a878a9f0f88aaa946510dd66 + react-native-appboy-sdk: dd0f7fb390666c6cfea7e177dcf22c3391e9cc39 React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360 React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72 diff --git a/AppboyProject/yarn.lock b/AppboyProject/yarn.lock index 5e554a8..0c45f3a 100644 --- a/AppboyProject/yarn.lock +++ b/AppboyProject/yarn.lock @@ -2787,9 +2787,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" glob-parent@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -5001,7 +5001,7 @@ react-is@^16.8.1, react-is@^16.8.4, react-is@^16.9.0: integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== "react-native-appboy-sdk@file:..": - version "1.29.1" + version "1.30.0" react-native@^0.61.5: version "0.61.5" diff --git a/CHANGELOG.md b/CHANGELOG.md index 25fbc24..e51ddd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.30.0 + +##### ⚠ Breaking +- Updated the native iOS bridge to [Braze iOS SDK 4.3.0](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#430), which fixes a crashing issue with Content Cards when using the default UI. +- Updated the native Android bridge to [Braze Android SDK 14.0.1](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#1401). + ## 1.29.1 ##### ⚠️ Known Issues diff --git a/android/build.gradle b/android/build.gradle index 4e343c3..2b83489 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,6 +17,6 @@ android { } dependencies { - api 'com.appboy:android-sdk-ui:14.0.0' + api 'com.appboy:android-sdk-ui:14.0.1' api 'com.facebook.react:react-native:+' } diff --git a/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java b/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java index 22657ed..17add77 100644 --- a/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java +++ b/android/src/main/java/com/appboy/reactbridge/AppboyReactBridge.java @@ -45,6 +45,7 @@ import com.facebook.react.bridge.ReadableType; import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; +import com.facebook.react.bridge.WritableNativeMap; import com.facebook.react.modules.core.DeviceEventManagerModule; import org.json.JSONObject; @@ -52,7 +53,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -720,11 +720,14 @@ private void subscribeToSdkAuthenticationErrorEvents() { mSdkAuthErrorSubscriber = new IEventSubscriber() { @Override public void trigger(BrazeSdkAuthenticationErrorEvent errorEvent) { - final Map data = new HashMap<>(); - data.put("error_code", errorEvent.getErrorCode()); - data.put("user_id", errorEvent.getUserId()); - data.put("original_signature", errorEvent.getSignature()); - data.put("error_reason", errorEvent.getErrorReason()); + if (!getReactApplicationContext().hasActiveCatalystInstance()) { + return; + } + final WritableNativeMap data = new WritableNativeMap(); + data.putInt("error_code", errorEvent.getErrorCode()); + data.putString("user_id", errorEvent.getUserId()); + data.putString("original_signature", errorEvent.getSignature()); + data.putString("error_reason", errorEvent.getErrorReason()); getReactApplicationContext() .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) diff --git a/package.json b/package.json index 7660482..393a219 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-appboy-sdk", - "version": "1.29.1", + "version": "1.30.0", "description": "Braze SDK for React Native.", "main": "index.js", "types": "index.d.ts", diff --git a/react-native-appboy-sdk.podspec b/react-native-appboy-sdk.podspec index 4e69ac8..3e282c2 100644 --- a/react-native-appboy-sdk.podspec +++ b/react-native-appboy-sdk.podspec @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.preserve_paths = 'LICENSE.md', 'README.md', 'package.json', 'index.js' s.source_files = 'iOS/**/*.{h,m}' - s.dependency 'Appboy-iOS-SDK', '~> 4.2.0' + s.dependency 'Appboy-iOS-SDK', '~> 4.3.0' s.dependency 'React' end