[SDK-2445] Update Branch native SDKs and Capacitor core to 6.0.0 (#154)

* feat!: upgrade to Capacitor v6

Just ran `npx @capacitor/plugin-migration-v5-to-v6@latest`

* Updated to the latest capacitor and native SDK versions

* Update listener to promise

* Updated changelog and updated pods

* Updated version to 8.0.0

---------

Co-authored-by: tafelnl <35837839+tafelnl@users.noreply.github.com>

Author: nsingh-branch

CHANGELOG.md

@@ -1,5 +1,12 @@
 Branch Capacitor SDK change log
 
+- 8.0.0
+
+  - Updated the `addListener` method to return a `Promise<PluginListenerHandle>`.
+  - Updates the core capacitor plugin to 6.0.0
+  - Branch Android SDK bumped to 5.12.0
+  - Branch iOS SDK bumped to 3.4.3
+
 - 7.1.0
 
   - Added new method, setDMAParamsForEEA(), for setting DMA compliance parameters.

android/build.gradle

@@ -19,21 +19,21 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.2.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
     namespace "co.boundstate.capacitorbranchdeeplinks"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     buildFeatures {
         buildConfig = true
     }
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -66,7 +66,7 @@ dependencies {
     implementation project(':capacitor-android')
     implementation 'androidx.annotation:annotation:1.4.0'
     implementation 'androidx.appcompat:appcompat:1.5.0'
-    api 'io.branch.sdk.android:library:5.9.0'
+    api 'io.branch.sdk.android:library:5.12.0'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

android/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

android/gradlew

@@ -4,7 +4,7 @@ def capacitor_pods
   use_frameworks!
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
-  pod 'BranchSDK', '~> 3.2.0'
+  pod 'BranchSDK', '~> 3.4.3'
 end
 
 target 'Plugin' do

ios/Podfile

@@ -1,11 +1,11 @@
 PODS:
-  - BranchSDK (3.0.1)
-  - Capacitor (5.5.1):
+  - BranchSDK (3.4.3)
+  - Capacitor (6.0.0):
     - CapacitorCordova
-  - CapacitorCordova (5.5.1)
+  - CapacitorCordova (6.0.0)
 
 DEPENDENCIES:
-  - BranchSDK (~> 3.0.1)
+  - BranchSDK (~> 3.4.3)
   - "Capacitor (from `../node_modules/@capacitor/ios`)"
   - "CapacitorCordova (from `../node_modules/@capacitor/ios`)"
 
@@ -20,10 +20,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@capacitor/ios"
 
 SPEC CHECKSUMS:
-  BranchSDK: e268bcf41469051c9e83efcd6fd85d0ba91d1d0f
-  Capacitor: 9da0a2415e3b6098511f8b5ffdb578d91ee79f8f
-  CapacitorCordova: e128cc7688c070ca0bfa439898a5f609da8dbcfe
+  BranchSDK: 078e92df232a7cc0a8d900287d1e57057a2e2997
+  Capacitor: 559d073c4ca6c27f8e7002c807eea94c3ba435a9
+  CapacitorCordova: 8c4bfdf69368512e85b1d8b724dd7546abeb30af
 
-PODFILE CHECKSUM: c730e0536dc486077a354a5b012e11d630c85889
+PODFILE CHECKSUM: 9848c096c118889beda819a4d6984c25fcf3f9bc
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2

ios/Podfile.lock

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-branch-deep-links",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "description": "Capacitor plugin for Branch.io deep links",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -19,10 +19,10 @@
   "author": "Bound State Software <info@boundstatesoftware.com>",
   "license": "MIT",
   "devDependencies": {
-    "@capacitor/android": "^5.0.0",
-    "@capacitor/cli": "^5.0.0",
-    "@capacitor/core": "^5.0.0",
-    "@capacitor/ios": "^5.0.0",
+    "@capacitor/android": "^6.0.0",
+    "@capacitor/cli": "^6.0.0",
+    "@capacitor/core": "^6.0.0",
+    "@capacitor/ios": "^6.0.0",
     "@ionic/prettier-config": "^1.0.0",
     "@ionic/swiftlint-config": "^1.0.0",
     "@rollup/plugin-node-resolve": "^8.1.0",
@@ -36,7 +36,7 @@
     "typescript": "^5.1.3"
   },
   "peerDependencies": {
-    "@capacitor/core": "^5.0.0"
+    "@capacitor/core": "^6.0.0"
   },
   "files": [
     "src/",

package.json

@@ -89,11 +89,11 @@ export interface BranchDeepLinksPlugin {
   addListener(
     eventName: 'init',
     listenerFunc: (event: BranchInitEvent) => void,
-  ): PluginListenerHandle;
+  ): Promise<PluginListenerHandle>;
   addListener(
     eventName: 'initError',
     listenerFunc: (error: any) => void,
-  ): PluginListenerHandle;
+  ): Promise<PluginListenerHandle>;
   handleUrl(options: BranchUrlParams): Promise<void>;
   generateShortUrl(
     options: BranchShortUrlParams,

src/definitions.ts

@@ -1,4 +1,4 @@
-import { WebPlugin } from '@capacitor/core';
+import { WebPlugin, PluginListenerHandle } from '@capacitor/core';
 
 import {
   BranchDeepLinksPlugin,
@@ -12,6 +12,7 @@ import {
   BranchQRCodeParams,
   BranchQRCodeResponse,
   BranchDMAParams,
+  BranchInitEvent,
 } from './definitions';
 
 export class BranchDeepLinksWeb
@@ -107,4 +108,21 @@ export class BranchDeepLinksWeb
       new Error('BranchDeepLinks does not have web implementation'),
     );
   }
+
+  addListener(
+    _eventName: 'init',
+    _listenerFunc: (event: BranchInitEvent) => void,
+  ): Promise<PluginListenerHandle>;
+  addListener(
+    _eventName: 'initError',
+    _listenerFunc: (error: any) => void,
+  ): Promise<PluginListenerHandle>;
+  addListener(
+    _eventName: string,
+    _listenerFunc: (event: any) => void,
+  ): Promise<PluginListenerHandle> {
+    return Promise.reject(
+      new Error('BranchDeepLinks does not have web implementation'),
+    );
+  }
 }