Merge branch 'master' into development

.github/workflows/deploy-to-QA.yml

@@ -25,10 +25,17 @@ jobs:
           fixed_version_found=false
           plugin_version=$(echo "$BRANCH_NAME" | grep -Eo '[0-9].[0-9]+.[0-9]+')
           jira_fixed_version="React Native SDK v$plugin_version"
-          # echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
           echo "JIRA_FIXED_VERSION=$jira_fixed_version" >> $GITHUB_ENV
           chmod +x .github/workflows/scripts/releaseNotesGenerator.sh
           .github/workflows/scripts/releaseNotesGenerator.sh $JIRA_TOKEN "$jira_fixed_version" 
+      
+      - name: Check version alignment between platforms
+        env:
+          BRANCH_NAME: ${{github.ref_name}}
+        run: |
+          plugin_version=$(echo "$BRANCH_NAME" | grep -Eo '[0-9].[0-9]+.[0-9]+')
+          chmod +x .github/workflows/scripts/versionsAlignmentValidator.sh
+          .github/workflows/scripts/versionsAlignmentValidator.sh "$plugin_version"
 
       - name: Update package.json file
         run: |

.github/workflows/scripts/versionsAlignmentValidator.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Plugin version from release branch
+PLUGIN_VERSION=$1
+
+# Gets the plugin version for platform_extension_v2 in every platform
+IOS_PLUGIN_VERSION=$(cat ios/RNAppsFlyer.h | grep 'kAppsFlyerPluginVersion' | grep -Eo '[0-9].[0-9]+.[0-9]')
+ANDROID_PLUGIN_VERSION=$(cat android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerConstants.java | grep 'PLUGIN_VERSION' | grep -Eo '[0-9].[0-9]+.[0-9]')
+
+# Check if PLUGIN_VERSION, IOS_PLUGIN_VERSION and ANDROID_PLUGIN_VERSION are equal
+echo "version from branch: $PLUGIN_VERSION\nplatform_extension_v2 ios: $IOS_PLUGIN_VERSION\nplatform_extension_v2 android: $ANDROID_PLUGIN_VERSION"
+if [[ "$PLUGIN_VERSION" == "$IOS_PLUGIN_VERSION" && "$PLUGIN_VERSION" == "$ANDROID_PLUGIN_VERSION" ]]; then
+    echo "platform_extension_v2 version is aligned"
+else
+    echo "platform_extension_v2 version is different!"
+    exit 1
+fi

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 6.12.1
+ Release date: *2023-07-26*
+
+- Add 'link' property to onDeepLink object
+- Update Android sdk v6.12.1
+- Update iOS sdk v6.12.0
+
 ## 6.10.3
  Release date: *2023-05-02*
 

Docs/RN_API.md

@@ -34,6 +34,7 @@ The list of available methods for this plugin is described below.
     - [sendPushNotificationData](#sendpushnotificationdata)
     - [addPushNotificationDeepLinkPath](#addpushnotificationdeeplinkpath)
     - [appendParametersToDeepLinkingURL](#appendparameterstodeeplinkingurl)
+    - [disableAdvertisingIdentifier](#disableAdvertisingIdentifier)
 - [Android Only APIs](#android-only-apis)
     - [setCollectAndroidID](#setcollectandroidid)
     - [setCollectIMEI](#setcollectimei)
@@ -731,6 +732,24 @@ Note:<br>
 appsFlyer.appendParametersToDeepLinkingURL('substring-of-url', {param1: 'value', pid: 'value2', is_retargeting: 'true'});
 ```
 
+---
+### disableAdvertisingIdentifier
+`disableAdvertisingIdentifier(shouldDisdable): void`
+
+Disables collection of various Advertising IDs by the SDK.<br>
+**Anroid:** Google Advertising ID (GAID), OAID and Amazon Advertising ID (AAID)<br>
+**iOS:** Apple's advertisingIdentifier (IDFA)
+
+| parameter       | type     | description                      |
+| ----------      |----------|------------------                |
+| shouldDisdable  | boolean  | Flag that disable/enable Advertising ID collection       |
+
+*Example:*
+
+```javascript
+appsFlyer.disableAdvertisingIdentifier(true);
+```
+
 ## Android Only APIs
 
 ### setCollectAndroidID 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-appsflyer",
-  "version": "6.10.3",
+  "version": "6.12.1",
   "description": "React Native Appsflyer plugin",
   "main": "index.js",
   "types": "index.d.ts",