Merge pull request #641 from AppsFlyerSDK/dev/DELIVERY-97312/Expo-SwiftAppDelegate

Expo swift app delegate

Author: al-af

Docs/RN_ExpoInstallation.md

@@ -22,7 +22,11 @@ expo install react-native-appsflyer
 ...
 "plugins": [
       [
-        "react-native-appsflyer",{}
+        "react-native-appsflyer",
+        {
+          "shouldUseStrictMode": false,          // optional – kids-apps strict mode
+          "shouldUsePurchaseConnector": true     // NEW – enables Purchase Connector
+        }
       ]
     ],
 ...
@@ -112,3 +116,10 @@ In v6.8.0 of the AppsFlyer SDK, we added the normal permission com.google.androi
 to allow the SDK to collect the Android Advertising ID on apps targeting API 33.
 If your app is targeting children, you need to revoke this permission to comply with Google's Data policy.
 You can read more about it [here](https://docs.expo.dev/guides/permissions/#android).
+
+### Purchase Connector (optional)
+
+Setting `"shouldUsePurchaseConnector": true` will:
+
+* **iOS** – add the `PurchaseConnector` CocoaPod automatically  
+* **Android** – add `appsflyer.enable_purchase_connector=true` to `gradle.properties`

README.md

@@ -12,8 +12,8 @@
 
 ### <a id="plugin-build-for"> This plugin is built for
 
-- Android AppsFlyer SDK **v6.17.0**
-- iOS AppsFlyer SDK **v6.17.1**
+- Android AppsFlyer SDK **v6.17.1**
+- iOS AppsFlyer SDK **v6.17.2**
 - Tested with React-Native **v0.62.0** (older versions might be supported)
 
 ## <a id="release-updates"> Release Updates

android/build.gradle

@@ -70,7 +70,7 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:1.7.10" // Add Kotlin standard library
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    api "com.appsflyer:af-android-sdk:${safeExtGet('appsflyerVersion', '6.17.0')}"
+    api "com.appsflyer:af-android-sdk:${safeExtGet('appsflyerVersion', '6.17.1')}"
     implementation "com.android.installreferrer:installreferrer:${safeExtGet('installReferrerVersion', '2.2')}"
     if (includeConnector){
         implementation 'com.appsflyer:purchase-connector:2.1.1'

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerConstants.java

@@ -6,7 +6,7 @@
 
 public class RNAppsFlyerConstants {
 
-    final static String PLUGIN_VERSION = "6.17.1";
+    final static String PLUGIN_VERSION = "6.17.2";
     final static String NO_DEVKEY_FOUND = "No 'devKey' found or its empty";
     final static String UNKNOWN_ERROR = "AF Unknown Error";
     final static String SUCCESS = "Success";

expo/withAppsFlyer.js

@@ -1,5 +1,12 @@
 const withAppsFlyerIos = require('./withAppsFlyerIos');
-module.exports = function withAppsFlyer(config, { shouldUseStrictMode = false } = {}) {
-	config = withAppsFlyerIos(config, shouldUseStrictMode);
-	return config;
+const withAppsFlyerAndroid = require('./withAppsFlyerAndroid');
+console.log('[AppsFlyerPlugin] Main plugin loaded');
+
+module.exports = function withAppsFlyer(config, { 
+  shouldUseStrictMode = false, 
+  shouldUsePurchaseConnector = false 
+} = {}) {
+  config = withAppsFlyerIos(config, { shouldUseStrictMode, shouldUsePurchaseConnector });
+  config = withAppsFlyerAndroid(config, { shouldUsePurchaseConnector });
+  return config;
 };

expo/withAppsFlyerAndroid.js

@@ -0,0 +1,23 @@
+const { withGradleProperties } = require('@expo/config-plugins');
+
+function addPurchaseConnectorFlag(config) {
+  return withGradleProperties(config, (cfg) => {
+    const props = cfg.modResults ?? [];
+   const exists = props.some((p) => p.key === 'appsflyer.enable_purchase_connector');
+    if (!exists) {
+      props.push({ type: 'property', key: 'appsflyer.enable_purchase_connector', value: 'true' });
+    } else {
+      console.log('[AppsFlyerPlugin] Flag already present, no changes made');
+    }
+    return cfg;
+  });
+}
+
+module.exports = function withAppsFlyerAndroid(config, { shouldUsePurchaseConnector = false } = {}) {
+  if (shouldUsePurchaseConnector) {
+    config = addPurchaseConnectorFlag(config);
+  } else {
+    console.log('[AppsFlyerPlugin] Purchase Connector disabled, skipping gradle property injection');
+  }
+  return config;
+};

expo/withAppsFlyerIos.js

@@ -153,37 +153,66 @@ Supported format: Expo SDK default template
   });
 };
 
-function withPodfile(config, shouldUseStrictMode) {
+function withPodfile(config, shouldUseStrictMode, shouldUsePurchaseConnector) {
   return withDangerousMod(config, [
     'ios',
     async (config) => {
       const filePath = path.join(config.modRequest.platformProjectRoot, 'Podfile');
       const contents = fs.readFileSync(filePath, 'utf-8');
 
-      const mergedPodfileWithStrictMode = mergeContents({
-        tag: 'AppsFlyer Strict Mode',
-        src: contents,
-        newSrc: `$RNAppsFlyerStrictMode=${shouldUseStrictMode}`,
-        anchor: 'use_expo_modules!',
-        offset: 0,
-        comment: '#',
-      });
-
-      if (!mergedPodfileWithStrictMode.didMerge) {
-        console.log("ERROR: Cannot add AppsFlyer strict mode to the project's ios/Podfile because it's malformed. Please report this with a copy of your project Podfile.");
-        return config;
+      let mergedContents = { contents, didMerge: true };
+
+      // Check if Strict Mode flag already exists
+      if (!contents.includes('$RNAppsFlyerStrictMode')) {
+        mergedContents = mergeContents({
+          tag: 'AppsFlyer Strict Mode',
+          src: mergedContents.contents,
+          newSrc: `$RNAppsFlyerStrictMode=${shouldUseStrictMode}`,
+          anchor: 'use_expo_modules!',
+          offset: 0,
+          comment: '#',
+        });
+
+        if (!mergedContents.didMerge) {
+          console.log("ERROR: Cannot add AppsFlyer strict mode to the project's ios/Podfile because it's malformed. Please report this with a copy of your project Podfile.");
+          return config;
+        }
+      } else {
+        console.log("INFO: $RNAppsFlyerStrictMode already exists in Podfile, skipping auto-assignment.");
       }
 
-      fs.writeFileSync(filePath, mergedPodfileWithStrictMode.contents);
+      // Check if Purchase Connector flag already exists
+      if (!contents.includes('$AppsFlyerPurchaseConnector')) {
+        mergedContents = mergeContents({
+          tag: 'AppsFlyer Purchase Connector',
+          src: mergedContents.contents,
+          newSrc: `$AppsFlyerPurchaseConnector=${shouldUsePurchaseConnector}`,
+          anchor: 'use_expo_modules!',
+          offset: mergedContents.contents.includes('$RNAppsFlyerStrictMode') ? 1 : 0,
+          comment: '#',
+        });
+
+        if (!mergedContents.didMerge) {
+          console.log("ERROR: Cannot add AppsFlyer Purchase Connector to the project's ios/Podfile because it's malformed. Please report this with a copy of your project Podfile.");
+          return config;
+        }
+      } else {
+        console.log("INFO: $AppsFlyerPurchaseConnector already exists in Podfile, skipping auto-assignment.");
+      }
+
+      fs.writeFileSync(filePath, mergedContents.contents);
 
       return config;
     },
   ]);
 }
 
-module.exports = function withAppsFlyerIos(config, shouldUseStrictMode) {
-  config = withPodfile(config, shouldUseStrictMode);
+module.exports = function withAppsFlyerIos(config, { 
+  shouldUseStrictMode = false, 
+  shouldUsePurchaseConnector = false 
+} = {}) {
+  config = withPodfile(config, shouldUseStrictMode, shouldUsePurchaseConnector);
   config = withIosBridgingHeader(config);
   config = withAppsFlyerAppDelegate(config);
   return config;
-};
+};

ios/RNAppsFlyer.h

@@ -22,7 +22,7 @@
 @end
 
 
-static NSString *const kAppsFlyerPluginVersion      = @"6.17.1";
+static NSString *const kAppsFlyerPluginVersion      = @"6.17.2";
 static NSString *const NO_DEVKEY_FOUND              = @"No 'devKey' found or its empty";
 static NSString *const NO_APPID_FOUND               = @"No 'appId' found or its empty";
 static NSString *const NO_EVENT_NAME_FOUND          = @"No 'eventName' found or its empty";

package.json

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

react-native-appsflyer.podspec

@@ -30,19 +30,19 @@ Pod::Spec.new do |s|
   # AppsFlyerPurchaseConnector
   if defined?($AppsFlyerPurchaseConnector) && ($AppsFlyerPurchaseConnector == true)
     Pod::UI.puts "#{s.name}: Including PurchaseConnector."
-    s.dependency 'PurchaseConnector', '6.17.1'
+    s.dependency 'PurchaseConnector', '6.17.2'
   end
 
   # AppsFlyerFramework
   if defined?($RNAppsFlyerStrictMode) && ($RNAppsFlyerStrictMode == true)
     Pod::UI.puts "#{s.name}: Using AppsFlyerFramework/Strict mode"
-    s.dependency 'AppsFlyerFramework/Strict', '6.17.1'
+    s.dependency 'AppsFlyerFramework/Strict', '6.17.2'
     s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AFSDK_NO_IDFA=1' }
   else
     if !defined?($RNAppsFlyerStrictMode)
       Pod::UI.puts "#{s.name}: Using default AppsFlyerFramework. You may require App Tracking Transparency. Not allowed for Kids apps."
       Pod::UI.puts "#{s.name}: You may set variable `$RNAppsFlyerStrictMode=true` in Podfile to use strict mode for kids apps."
     end
-    s.dependency 'AppsFlyerFramework', '6.17.1'
+    s.dependency 'AppsFlyerFramework', '6.17.2'
   end
 end