Release version 1.34.0

braze-inc · Jan 20, 2022 · 38c2e25 · 38c2e25
1 parent bb6f2de
commit 38c2e25
Show file tree

Hide file tree

Showing 17 changed files with 1,455 additions and 1,108 deletions.
diff --git a/AppboyProject/AppboyProject.js b/AppboyProject/AppboyProject.js
@@ -6,14 +6,15 @@ import {
   View,
   ScrollView,
   TouchableHighlight,
-  Picker,
   Linking,
   Alert,
   TextInput,
   Platform,
   DeviceEventEmitter
 } from 'react-native';
 
+import { Picker } from '@react-native-picker/picker';
+
 const ReactAppboy = require('react-native-appboy-sdk');
 
 class AppboyProject extends Component {

diff --git a/AppboyProject/android/app/build.gradle b/AppboyProject/android/app/build.gradle
@@ -95,13 +95,13 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "com.appboyproject"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 21
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         ndk {
@@ -165,7 +165,7 @@ apply plugin: 'com.google.gms.google-services'
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-  from configurations.compile
+  from configurations.implementation
   into 'libs'
 }
 

diff --git a/AppboyProject/android/app/src/main/AndroidManifest.xml b/AppboyProject/android/app/src/main/AndroidManifest.xml
@@ -25,7 +25,8 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+        android:exported="true">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <action android:name="android.intent.action.VIEW" />
@@ -39,6 +40,7 @@
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"
+        android:exported="true"/>
     </application>
 </manifest>
diff --git a/AppboyProject/android/app/src/main/java/com/appboyproject/MainActivity.java b/AppboyProject/android/app/src/main/java/com/appboyproject/MainActivity.java
@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
     Intent intent = getIntent();
     Uri data = intent.getData();
     if (data != null) {
-      Toast.makeText(this, "Activity opened by deep link: " + data.toString(), Toast.LENGTH_LONG);
+      Toast.makeText(this, "Activity opened by deep link: " + data.toString(), Toast.LENGTH_LONG).show();
       Log.i(TAG, "Deep link is " + data.toString());
     }
     class BrazeInAppMessageManagerListener implements IInAppMessageManagerListener {

diff --git a/AppboyProject/android/app/src/main/java/com/appboyproject/MainApplication.java b/AppboyProject/android/app/src/main/java/com/appboyproject/MainApplication.java
@@ -3,17 +3,14 @@
 import android.app.Application;
 import android.util.Log;
 
-import com.appboy.AppboyLifecycleCallbackListener;
-import com.appboy.reactbridge.AppboyReactPackage;
-import com.appboy.support.AppboyLogger;
+import com.braze.BrazeActivityLifecycleCallbackListener;
+import com.braze.support.BrazeLogger;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 
-import java.util.Arrays;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication {
@@ -40,8 +37,8 @@ public ReactNativeHost getReactNativeHost() {
   @Override
   public void onCreate() {
     super.onCreate();
-    registerActivityLifecycleCallbacks(new AppboyLifecycleCallbackListener());
-    AppboyLogger.setLogLevel(Log.VERBOSE);
+    registerActivityLifecycleCallbacks(new BrazeActivityLifecycleCallbackListener());
+    BrazeLogger.setLogLevel(Log.VERBOSE);
     SoLoader.init(this, /* native exopackage */ false);
   }
 }
diff --git a/AppboyProject/android/build.gradle b/AppboyProject/android/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "com.google.gms:google-services:4.3.4"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,11 +15,11 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
-        jcenter()
         maven { url "$rootDir/../node_modules/react-native/android" }
-        maven { url "http://appboy.github.io/appboy-android-sdk/sdk" }
-        google()
         maven { url "$rootDir/../node_modules/jsc-android/dist" }
+        google()
+        mavenCentral()
+        maven { url "https://appboy.github.io/appboy-android-sdk/sdk" }
+        mavenLocal()
     }
 }
diff --git a/AppboyProject/android/gradle/wrapper/gradle-wrapper.properties b/AppboyProject/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/AppboyProject/ios/AppboyProject/AppDelegate.m b/AppboyProject/ios/AppboyProject/AppDelegate.m
@@ -70,11 +70,7 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNoti
   [[Appboy sharedInstance] userNotificationCenter:center didReceiveNotificationResponse:response withCompletionHandler:completionHandler];
 }
 
-- (void) application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-  [[Appboy sharedInstance] registerApplication:application didReceiveRemoteNotification:userInfo];
-}
-
-- (void) application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
   [[Appboy sharedInstance] registerDeviceToken:deviceToken];
 }
 

diff --git a/AppboyProject/ios/Podfile.lock b/AppboyProject/ios/Podfile.lock
@@ -199,7 +199,7 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
   - React-jsinspector (0.61.5)
-  - react-native-appboy-sdk (1.33.1):
+  - react-native-appboy-sdk (1.34.0):
     - Appboy-iOS-SDK (~> 4.3.4)
     - React
   - React-RCTActionSheet (0.61.5):
@@ -350,7 +350,7 @@ SPEC CHECKSUMS:
   React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
   React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
   React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
-  react-native-appboy-sdk: 91fb3c1b9d27fc1de2dc90c0239eecdb64929b44
+  react-native-appboy-sdk: cdb33785e7f182f1ef7341c63626586605282e83
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -366,4 +366,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 12f4fef8b6ce7354bd8698dc795dfb0568db600d
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2
diff --git a/AppboyProject/package.json b/AppboyProject/package.json
@@ -8,22 +8,24 @@
     "ios": "react-native run-ios",
     "start": "react-native start",
     "test": "jest",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "force_update": "yarn upgrade react-native-appboy-sdk"
   },
   "dependencies": {
-    "react": "16.9.0",
-    "react-native": "^0.61.5",
+    "react": "17.0.2",
+    "react-native": "^0.66.4",
     "react-native-appboy-sdk": "file:.."
   },
   "devDependencies": {
     "@babel/core": "^7.6.2",
     "@babel/runtime": "^7.6.2",
     "@react-native-community/eslint-config": "^0.0.5",
+    "@react-native-picker/picker": "^2.2.1",
     "babel-jest": "^24.9.0",
     "eslint": "^6.5.1",
     "jest": "^24.9.0",
-    "metro-react-native-babel-preset": "^0.56.0",
-    "react-test-renderer": "16.9.0"
+    "metro-react-native-babel-preset": "^0.66.2",
+    "react-test-renderer": "^17.0.2"
   },
   "jest": {
     "preset": "react-native"