Merge pull request #52 from AppsFlyerSDK/dev/DELIVERY-99951/update-to-6.17.7

Dev/delivery 99951/update to 6.17.7

Author: af-obodovskyi

.gitignore

@@ -109,7 +109,11 @@ proj.win32/Release.*/
 
 # others
 cocos2d
+Build-ios
 
 .vscode/
+.lsp/
+.clj-kondo/
+.idea/
 
 proj.android-studio/.idea/

CHANGELOG.md

@@ -1,4 +1,4 @@
-# Versions
+ # Versions
 
 ## 6.10.3
     - update Android SDK to 6.10.3

CMakeLists.txt

@@ -25,9 +25,10 @@
 
 cmake_minimum_required(VERSION 3.6)
 
-set(APP_NAME MyGame)
+set(APP_NAME AppsFlyerCocos2dX)
 
 project(${APP_NAME})
+set(CMAKE_XCODE_GENERATE_SCHEME TRUE)
 
 set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cocos2d)
 set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)
@@ -55,17 +56,35 @@ endif()
 
 # add cross-platforms source files and header files 
 list(APPEND GAME_SOURCE
-     Classes/AppsFlyer/AppsFlyerX.cpp
      Classes/AppDelegate.cpp
      Classes/HelloWorldScene.cpp
+     Classes/AppsFlyer/AFSDKXPurchaseDetails.cpp
+     Classes/AppsFlyer/AFSDKXValidateAndLogResult.cpp
+     Classes/AppsFlyer/AFXAdRevenueData.cpp
+     Classes/AppsFlyer/AppsFlyerX.cpp
+     Classes/AppsFlyer/AppsFlyerXApple.mm
+     Classes/AppsFlyer/AppsFlyerXAppleDeepLinkDelegate.mm
+     Classes/AppsFlyer/AppsFlyerXAppleDelegate.mm
+     Classes/AppsFlyer/AppsFlyerXAppleHelper.mm
+     Classes/AppsFlyer/AppsFlyerXConsent.cpp
      Classes/AppsFlyer/AppsFlyerXDeepLinkResult.cpp
-     )
+)
+
 list(APPEND GAME_HEADER
-     Classes/AppsFlyer/AppsFlyerX.h
      Classes/AppDelegate.h
      Classes/HelloWorldScene.h
+     Classes/AppsFlyer/AFSDKXPurchaseDetails.h
+     Classes/AppsFlyer/AFSDKXValidateAndLogResult.h
+     Classes/AppsFlyer/AFXAdRevenueData.h
+     Classes/AppsFlyer/AppsFlyerX.h
+     Classes/AppsFlyer/AppsFlyerXApple.h
+     Classes/AppsFlyer/AppsFlyerXAppleDeepLinkDelegate.h
+     Classes/AppsFlyer/AppsFlyerXAppleDelegate.h
+     Classes/AppsFlyer/AppsFlyerXAppleHelper.h
      Classes/AppsFlyer/AppsFlyerXDeepLinkResult.h
-     )
+     Classes/AppsFlyer/AppsFlyerXMacro.h
+     Classes/AppsFlyer/EmailCryptTypeX.h
+)
 
 if(ANDROID)
     list(APPEND GAME_SOURCE
@@ -79,7 +98,7 @@ if(ANDROID)
     )
 
     # change APP_NAME to the share library name for Android, it's value depend on AndroidManifest.xml
-    set(APP_NAME MyGame)
+    set(APP_NAME AppsFlyerCocos2dX)
     list(APPEND GAME_SOURCE
          proj.android-studio/app/jni/hellocpp/main.cpp
          )
@@ -149,20 +168,49 @@ target_include_directories(${APP_NAME}
         PRIVATE Classes
         PRIVATE ${COCOS2DX_ROOT_PATH}/cocos/audio/include/
 )
+if(APPLE AND IOS)
+    string(FIND "${CMAKE_OSX_SYSROOT}" "iPhoneSimulator" _is_simulator_sysroot)
+    if(_is_simulator_sysroot GREATER -1)
+        set(_swift_platform_folder "iphonesimulator")
+    else()
+        set(_swift_platform_folder "iphoneos")
+    endif()
+
+    if(NOT DEFINED APPLE_DEVELOPER_ROOT)
+        execute_process(COMMAND xcode-select -p OUTPUT_VARIABLE APPLE_DEVELOPER_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
+    set(_swift_lib_root "${APPLE_DEVELOPER_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/${_swift_platform_folder}")
+
+    foreach(_swift_lib swiftCompatibility50 swiftCompatibility51 swiftCompatibilityConcurrency swiftCompatibilityDynamicReplacements)
+        string(TOUPPER "${_swift_lib}" _swift_lib_upper)
+        set(_swift_var "SWIFT_LIB_${_swift_lib_upper}")
+        find_library(${_swift_var} ${_swift_lib} HINTS "${_swift_lib_root}" NO_DEFAULT_PATH)
+        if(${_swift_var})
+            target_link_libraries(${APP_NAME} "${${_swift_var}}")
+        else()
+            message(WARNING "Could not locate ${_swift_lib} inside ${_swift_lib_root}")
+        endif()
+    endforeach()
+endif()
 
 # mark app resources
 setup_cocos_app_config(${APP_NAME})
 if(APPLE)
+    if(IOS)
+        # Force DerivedData into the build tree so sandboxed environments can write to it
+        set(CMAKE_XCODE_ATTRIBUTE_DERIVED_DATA_PATH "${PROJECT_BINARY_DIR}/DerivedData")
+    endif()
     set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}")
     if(MACOSX)
         set_target_properties(${APP_NAME} PROPERTIES
                               MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist"
                               )
     elseif(IOS)
-        cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
+        #cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
         # set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon")
         set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "")
         set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer")
+        set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "com.appsflyer.AppsFlyerCocos2dX")
     endif()
 elseif(WINDOWS)
     cocos_copy_target_dll(${APP_NAME})

Classes/AppsFlyer/AppsFlyerXApple.mm

@@ -270,7 +270,8 @@
 
     [[AppsFlyerLib shared] validateAndLogInAppPurchase:afPurchaseDetails extraEventValues:lParams completionHandler:^(AFSDKValidateAndLogResult * _Nullable result) {
         // TODO: - add result to completionHandler
-        NSLog(@"[ValidateAndLog] Result: %@", result);
+        NSLog(@"[ValidateAndLog] Result: %@", result.error);
+        NSLog(@"[ValidateAndLog] Result: %@", result.errorData);
         AFSDKXValidateAndLogStatus status = AFSDKXValidateAndLogResult::objcEnumToCppEnum(result.status);
         cocos2d::ValueMap resultX = AppsFlyerXAppleHelper::nsDictionary2ValueMap(result.result);
         cocos2d::ValueMap errorData = AppsFlyerXAppleHelper::nsDictionary2ValueMap(result.errorData);

Classes/AppsFlyer/libAppsFlyer/AFSDKPurchaseDetails.h

@@ -5,19 +5,20 @@
 //  Created by Moris Gateno on 13/03/2024.
 //
 
+#import "AFSDKPurchaseType.h"
+
 @interface AFSDKPurchaseDetails : NSObject
 
-- (nonnull instancetype)init NS_UNAVAILABLE;
-+ (nonnull instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
 
-@property (strong, nullable, nonatomic) NSString *productId;
-@property (strong, nullable, nonatomic) NSString *price;
-@property (strong, nullable, nonatomic) NSString *currency;
-@property (strong, nullable, nonatomic) NSString *transactionId;
+@property (nonatomic, copy, readonly) NSString *productId;
+@property (nonatomic, copy, readonly) NSString *transactionId;
+@property (nonatomic, assign, readonly) AFSDKPurchaseType purchaseType;
 
-- (instancetype _Nonnull )initWithProductId:(NSString *_Nullable)productId
-                                      price:(NSString *_Nullable)price
-                                   currency:(NSString *_Nullable)currency
-                              transactionId:(NSString *_Nullable)transactionId;
+// Designated initializer for VAL2-compliant purchase object
+- (instancetype)initWithProductId:(NSString *)productId
+                   transactionId:(NSString *)transactionId
+                    purchaseType:(AFSDKPurchaseType)purchaseType NS_DESIGNATED_INITIALIZER;
 
 @end

Classes/AppsFlyer/libAppsFlyer/AFSDKPurchaseType.h

@@ -0,0 +1,16 @@
+//
+//  AFSDKPurchaseType.h
+//  AppsFlyerLib
+//
+//  Created by Amit Levy on 13/05/2025.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef NS_CLOSED_ENUM(NSUInteger, AFSDKPurchaseType) {
+    AFSDKPurchaseTypeSubscription,
+    AFSDKPurchaseTypeOneTimePurchase
+} NS_SWIFT_NAME(AFSDKPurchaseType);
+
+// Helper to get string route name
+FOUNDATION_EXPORT NSString *StringFromAFSDKPurchaseType(AFSDKPurchaseType type);

Classes/AppsFlyer/libAppsFlyer/AFSDKValidateAndLogResult.h

@@ -9,12 +9,12 @@
 typedef NS_CLOSED_ENUM(NSUInteger, AFSDKValidateAndLogStatus) {
     AFSDKValidateAndLogStatusSuccess,
     AFSDKValidateAndLogStatusFailure,
-    AFSDKValidateAndLogStatusError
+        AFSDKValidateAndLogStatusError
 } NS_SWIFT_NAME(ValidateAndLogStatus);
 
 NS_SWIFT_NAME(ValidateAndLogResult)
-@interface AFSDKValidateAndLogResult: NSObject
-       
+@interface AFSDKValidateAndLogResult : NSObject
+
 - (nonnull instancetype)init NS_UNAVAILABLE;
 + (nonnull instancetype)new NS_UNAVAILABLE;
 

Classes/AppsFlyer/libAppsFlyer/AppsFlyerConsent.h

@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
+// Generated by Apple Swift version 5.9.2 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
 #ifndef APPSFLYERLIB_SWIFT_H
 #define APPSFLYERLIB_SWIFT_H
 #pragma clang diagnostic push
@@ -277,6 +277,8 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #if __has_warning("-Watimport-in-framework-header")
 #pragma clang diagnostic ignored "-Watimport-in-framework-header"
 #endif
+@import Foundation;
+@import ObjectiveC;
 #endif
 
 #endif
@@ -297,6 +299,24 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #endif
 
 #if defined(__OBJC__)
+@class NSNumber;
+@class NSCoder;
+
+SWIFT_CLASS_NAMED("AppsFlyerConsent")
+@interface AppsFlyerConsent : NSObject <NSCoding>
+@property (nonatomic, readonly) BOOL isUserSubjectToGDPR;
+@property (nonatomic, readonly) BOOL hasConsentForDataUsage;
+@property (nonatomic, readonly) BOOL hasConsentForAdsPersonalization;
+@property (nonatomic, readonly, strong) NSNumber * _Nullable hasConsentForAdStorage;
+- (nonnull instancetype)init SWIFT_UNAVAILABLE;
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
+- (nonnull instancetype)initWithNonGDPRUser SWIFT_DEPRECATED_MSG("Use init(isUserSubjectToGDPR:, hasConsentForDataUsage:, hasConsentForAdsPersonalization:, hasConsentForAdStorage:) instead");
+- (nonnull instancetype)initWithIsUserSubjectToGDPR:(NSNumber * _Nullable)isUserSubjectToGDPR hasConsentForDataUsage:(NSNumber * _Nullable)hasConsentForDataUsage hasConsentForAdsPersonalization:(NSNumber * _Nullable)hasConsentForAdsPersonalization hasConsentForAdStorage:(NSNumber * _Nullable)hasConsentForAdStorage;
+- (nonnull instancetype)initForGDPRUserWithHasConsentForDataUsage:(BOOL)forGDPRUserWithHasConsentForDataUsage hasConsentForAdsPersonalization:(BOOL)hasConsentForAdsPersonalization SWIFT_DEPRECATED_MSG("Use init(isUserSubjectToGDPR:, hasConsentForDataUsage:, hasConsentForAdsPersonalization:, hasConsentForAdStorage:) instead");
+- (void)encodeWithCoder:(NSCoder * _Nonnull)coder;
+- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder;
+@end
+
 #endif
 #if __has_attribute(external_source_symbol)
 # pragma clang attribute pop

Classes/AppsFlyer/libAppsFlyer/AppsFlyerLib-Swift.h

@@ -2,7 +2,7 @@
 //  AppsFlyerLib.h
 //  AppsFlyerLib
 //
-//  AppsFlyer iOS SDK 6.15.3 (217)
+//  AppsFlyer iOS SDK 6.12.2 (999)
 //  Copyright (c) 2012-2023 AppsFlyer Ltd. All rights reserved.
 //
 
@@ -12,11 +12,12 @@
 #import "AppsFlyerShareInviteHelper.h"
 #import "AppsFlyerDeepLinkResult.h"
 #import "AppsFlyerDeepLink.h"
-#import "AppsFlyerConsent.h"
 #import "AFSDKPurchaseDetails.h"
+#import "AFSDKPurchaseType.h"
 #import "AFSDKValidateAndLogResult.h"
 #import "AFAdRevenueData.h"
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 // In app event names constants
@@ -129,13 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
 #define AFEventParamPreferredNeighborhoods  @"af_preferred_neighborhoods" //array of string
 #define AFEventParamPreferredNumStops       @"af_preferred_num_stops"
 
-#define AFEventParamAdRevenueAdType              @"af_adrev_ad_type"
-#define AFEventParamAdRevenueNetworkName         @"af_adrev_network_name"
-#define AFEventParamAdRevenuePlacementId         @"af_adrev_placement_id"
-#define AFEventParamAdRevenueAdSize              @"af_adrev_ad_size"
-#define AFEventParamAdRevenueMediatedNetworkName @"af_adrev_mediated_network_name"
-
 
+@class AppsFlyerConsent;
 /// Mail hashing type
 typedef enum  {
     /// None
@@ -496,16 +492,28 @@ NS_SWIFT_NAME(logEvent(name:values:completionHandler:));
 typedef void (^AFSDKValidateAndLogCompletion)(AFSDKValidateAndLogResult * _Nullable result);
 
 /**
- To log and validate in app purchases you can call this method from the completeTransaction: method on
- your `SKPaymentTransactionObserver`.
+ Validates and logs an in-app purchase using the updated VAL V2 flow.
+
+ This method should be called after a successful transaction, typically from:
+ - `paymentQueue:updatedTransactions:` in your `SKPaymentTransactionObserver` (StoreKit 1)
+ - `transaction.listener` or `.finishTransaction()` or  `VerificationResult<SignedType>` in StoreKit 2 (iOS 15+)
+
+ @param purchaseDetails a `AFSDKPurchaseDetails` object. Must include:
+    - `productId` (non-empty)
+    - `transactionId` (non-empty)
+    - `purchaseType` ( `.subscription`, `.oneTimePurchase`)
  
- @param details The product details
- @param extraEventValues The additional param, which you want to receive it in the raw reports
- @param completionHandler The callback
+ @param purchaseAdditionalDetails Optional metadata associated with the purchase
+ (previously known as `extraEventValues`). This can include custom app-level context.
+
+ @param completion Completion block with either a response dictionary or an NSError.
+ On success: `response` contains a parsed result.
+ On failure: `error` describes the reason (validation failure, networking issue...)
  */
-- (void)validateAndLogInAppPurchase:(AFSDKPurchaseDetails *)details
-                   extraEventValues:(NSDictionary * _Nullable)extraEventValues
-                  completionHandler:(AFSDKValidateAndLogCompletion)completionHandler NS_AVAILABLE(10_7, 7_0);
+- (void)validateAndLogInAppPurchase:(AFSDKPurchaseDetails *)purchaseDetails
+          purchaseAdditionalDetails:(NSDictionary * _Nullable)purchaseAdditionalDetails
+                         completion:(void (^)(NSDictionary * _Nullable response, NSError * _Nullable error))completion
+NS_SWIFT_NAME(validateAndLogInAppPurchase(purchaseDetails:purchaseAdditionalDetails:completion:));
 
 /**
  An API to provide the data from the impression payload to AdRevenue.
@@ -695,6 +703,14 @@ typedef void (^AFSDKValidateAndLogCompletion)(AFSDKValidateAndLogResult * _Nulla
 - (void)setSharingFilterForPartners:(NSArray<NSString *> * _Nullable)sharingFilter;
 
 
+/**
+    Sets Custom Install Id - this overrides the default AppsFlyer Install ID.
+    Only effective if Info.plist has `AppsFlyerAllowCustomInstallId=YES`
+     * Must be called before calling set appsFlyerDevKey and appleAppID
+    @param customID the customId.
+    */
+- (void)setInstallId:(NSString *)customID;
+
 /**
     Sets or updates the user consent data related to GDPR and DMA regulations for advertising and data usage
     purposes within the application. This method must be invoked with the user's current consent status each