diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4eb3f8f1..30ee764a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,12 @@ jobs: - uses: actions/checkout@v2 with: lfs: true + - name: free up space + run: | + rm -rf /usr/share/dotnet/ + rm -rf "/usr/local/share/boost" + rm -rf "$AGENT_TOOLSDIRECTORY" + rm -rf /opt/ghc - uses: game-ci/unity-builder@v2 env: UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} @@ -65,6 +71,7 @@ jobs: # https://github.com/actions/virtual-environments/issues/709#issuecomment-612569242 rm -rf "/usr/local/share/boost" rm -rf "$AGENT_TOOLSDIRECTORY" + rm -rf /opt/ghc # After echo "Disk space after:" diff --git a/Assets/AppsFlyer/AppsFlyer.cs b/Assets/AppsFlyer/AppsFlyer.cs index 2bc910d6..e290206c 100644 --- a/Assets/AppsFlyer/AppsFlyer.cs +++ b/Assets/AppsFlyer/AppsFlyer.cs @@ -7,7 +7,7 @@ namespace AppsFlyerSDK public class AppsFlyer : MonoBehaviour { - public static readonly string kAppsFlyerPluginVersion = "6.12.21"; + public static readonly string kAppsFlyerPluginVersion = "6.12.22"; public static string CallBackObjectName = null; private static EventHandler onRequestResponse; private static EventHandler onInAppResponse; diff --git a/Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml b/Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml index 08173e2c..b9187225 100644 --- a/Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml +++ b/Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml @@ -4,7 +4,7 @@ - + diff --git a/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h b/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h new file mode 100644 index 00000000..c838a934 --- /dev/null +++ b/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h @@ -0,0 +1,22 @@ +// +// AFUnityUtils.h +// +// Created by Andrii H. and Dmitry O. on 16 Oct 2023 +// + +#if __has_include() +#import +#else +#import "AppsFlyerLib.h" +#endif + +static NSString* stringFromChar(const char *str); +static NSDictionary* dictionaryFromJson(const char *jsonString); +static const char* stringFromdictionary(NSDictionary* dictionary); +static NSArray *NSArrayFromCArray(int length, const char **arr); +static char* getCString(const char* string); +static AppsFlyerLinkGenerator* generatorFromDictionary(NSDictionary* dictionary, AppsFlyerLinkGenerator* generator); +static EmailCryptType emailCryptTypeFromInt(int emailCryptTypeInt); +static NSString* stringFromDeepLinkResultStatus(AFSDKDeepLinkResultStatus deepLinkResult); +static NSString* stringFromDeepLinkResultError(AppsFlyerDeepLinkResult *result); + diff --git a/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h.meta b/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h.meta new file mode 100644 index 00000000..f6811a68 --- /dev/null +++ b/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 4b0609ff467554f2088aee1c52bf54a2 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.mm b/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.mm index 8e55713a..3084fc75 100644 --- a/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.mm +++ b/Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.mm @@ -5,12 +5,7 @@ // Created by Jonathan Wesfield on 24/07/2019. // -#if __has_include() -#import -#else -#import "AppsFlyerLib.h" -#endif - +#import "AFUnityUtils.h" static NSString* stringFromChar(const char *str) { return str ? [NSString stringWithUTF8String:str] : nil; diff --git a/Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm b/Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm index 60c41b43..b13a2e8f 100644 --- a/Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm +++ b/Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm @@ -18,7 +18,7 @@ static void unityCallBack(NSString* objectName, const char* method, const char* const void _startSDK(bool shouldCallback, const char* objectName) { [[AppsFlyerLib shared] setPluginInfoWith: AFSDKPluginUnity - pluginVersion:@"6.12.21" + pluginVersion:@"6.12.22" additionalParams:nil]; startRequestObjectName = stringFromChar(objectName); AppsFlyeriOSWarpper.didCallStart = YES; diff --git a/Assets/AppsFlyer/package.json b/Assets/AppsFlyer/package.json index 1a19258e..915962bd 100644 --- a/Assets/AppsFlyer/package.json +++ b/Assets/AppsFlyer/package.json @@ -2,7 +2,7 @@ "name": "appsflyer-unity-plugin", "displayName": "AppsFlyer", "description": "AppsFlyer Unity plugin", - "version": "6.12.21", + "version": "6.12.22", "unity": "2019.4", "license": "MIT" } diff --git a/CHANGELOG.md b/CHANGELOG.md index b3a31f9f..3a73acfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Versions +## v6.12.22 +* Update EDM4U - 1.2.177 +* Fix AFUnityUtils import + ## v6.12.21 * Update iOS SDK version - 6.12.2 diff --git a/android-unity-wrapper/gradle.properties b/android-unity-wrapper/gradle.properties index fb10efd6..3c5e7cf3 100644 --- a/android-unity-wrapper/gradle.properties +++ b/android-unity-wrapper/gradle.properties @@ -20,8 +20,8 @@ android.enableJetifier=true GROUP=com.appsflyer -VERSION_CODE=30 -VERSION_NAME=6.12.21 +VERSION_CODE=31 +VERSION_NAME=6.12.22 POM_ARTIFACT_ID=unity-wrapper POM_PACKAGING=aar diff --git a/android-unity-wrapper/unitywrapper/src/main/java/com/appsflyer/unity/AppsFlyerAndroidWrapper.java b/android-unity-wrapper/unitywrapper/src/main/java/com/appsflyer/unity/AppsFlyerAndroidWrapper.java index 8d1801fd..ec581cc0 100644 --- a/android-unity-wrapper/unitywrapper/src/main/java/com/appsflyer/unity/AppsFlyerAndroidWrapper.java +++ b/android-unity-wrapper/unitywrapper/src/main/java/com/appsflyer/unity/AppsFlyerAndroidWrapper.java @@ -37,7 +37,7 @@ public class AppsFlyerAndroidWrapper { private static final String ON_DEEPLINKING = "onDeepLinking"; private static final String START_REQUEST_CALLBACK = "requestResponseReceived"; private static final String IN_APP_RESPONSE_CALLBACK = "inAppResponseReceived"; - private static final String PLUGIN_VERSION = "6.12.21"; + private static final String PLUGIN_VERSION = "6.12.22"; private static AppsFlyerConversionListener conversionListener; private static String devkey = ""; diff --git a/appsflyer-unity-plugin-6.12.21.unitypackage b/appsflyer-unity-plugin-6.12.21.unitypackage deleted file mode 100644 index 9bbdfc9c..00000000 Binary files a/appsflyer-unity-plugin-6.12.21.unitypackage and /dev/null differ diff --git a/appsflyer-unity-plugin-6.12.22.unitypackage b/appsflyer-unity-plugin-6.12.22.unitypackage new file mode 100644 index 00000000..54496590 Binary files /dev/null and b/appsflyer-unity-plugin-6.12.22.unitypackage differ diff --git a/deploy/build_unity_package.sh b/deploy/build_unity_package.sh index 3ac08b86..55d13690 100644 --- a/deploy/build_unity_package.sh +++ b/deploy/build_unity_package.sh @@ -4,18 +4,18 @@ echo "Start Build for appsflyer-unity-plugin.unitypackage" DEPLOY_PATH=outputs UNITY_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity" -PACKAGE_NAME="appsflyer-unity-plugin-6.12.21.unitypackage" +PACKAGE_NAME="appsflyer-unity-plugin-6.12.22.unitypackage" mkdir -p $DEPLOY_PATH #move external dependency manager echo "moving the external dependency manager to root" -mv external-dependency-manager-1.2.144.unitypackage .. +mv external-dependency-manager-1.2.177.unitypackage .. # Build the .unitypackage - /Applications/Unity/Hub/Editor/2021.3.11f1/Unity.app/Contents/MacOS/Unity \ + /Volumes/T7Shield/Unity/2022.3.10f1/Unity.app/Contents/MacOS/Unity \ -gvh_disable \ -batchmode \ --importPackage external-dependency-manager-1.2.144.unitypackage \ +-importPackage external-dependency-manager-1.2.177.unitypackage \ -nographics \ -logFile create_unity_core.log \ -projectPath $PWD/../ \ @@ -23,13 +23,13 @@ mv external-dependency-manager-1.2.144.unitypackage .. Assets \ $PWD/$DEPLOY_PATH/$PACKAGE_NAME \ -quit \ -&& echo "package exported successfully to outputs/appsflyer-unity-plugin-6.12.21.unitypackage" \ +&& echo "package exported successfully to outputs/appsflyer-unity-plugin-6.12.22.unitypackage" \ || echo "Failed to export package. See create_unity_core.log for more info." if [ $1 == "-p" ]; then echo "moving back the external dependency manager to deploy" -mv ../external-dependency-manager-1.2.144.unitypackage . +mv ../external-dependency-manager-1.2.177.unitypackage . echo "removing ./Library" rm -rf ../Library echo "removing ./Logs" diff --git a/deploy/external-dependency-manager-1.2.144.unitypackage b/deploy/external-dependency-manager-1.2.144.unitypackage deleted file mode 100644 index a940d314..00000000 Binary files a/deploy/external-dependency-manager-1.2.144.unitypackage and /dev/null differ diff --git a/deploy/external-dependency-manager-1.2.177.unitypackage b/deploy/external-dependency-manager-1.2.177.unitypackage new file mode 100644 index 00000000..7f9c1d80 Binary files /dev/null and b/deploy/external-dependency-manager-1.2.177.unitypackage differ diff --git a/deploy/strict_mode_build_package.sh b/deploy/strict_mode_build_package.sh index 00c7c7af..ac730b18 100644 --- a/deploy/strict_mode_build_package.sh +++ b/deploy/strict_mode_build_package.sh @@ -5,12 +5,12 @@ echo "Start Build for appsflyer-unity-plugin.unitypackage. Strict Mode." DEPLOY_PATH=outputs UNITY_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity" - PACKAGE_NAME="appsflyer-unity-plugin-strict-mode-6.12.21.unitypackage" + PACKAGE_NAME="appsflyer-unity-plugin-strict-mode-6.12.22.unitypackage" mkdir -p $DEPLOY_PATH #move external dependency manager echo "moving the external dependency manager to root" -mv external-dependency-manager-1.2.144.unitypackage .. +mv external-dependency-manager-1.2.177.unitypackage .. echo "Changing AppsFlyerFramework to Strict Mode" sed -i '' 's/AppsFlyerFramework/AppsFlyerFramework\/Strict/g' ../Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml @@ -26,10 +26,10 @@ echo "Commenting out functions. Done." # Build the .unitypackage - /Applications/Unity/Hub/Editor/2021.3.11f1/Unity.app/Contents/MacOS/Unity \ + /Volumes/T7Shield/Unity/2022.3.10f1/Unity.app/Contents/MacOS/Unity \ -gvh_disable \ -batchmode \ - -importPackage external-dependency-manager-1.2.144.unitypackage \ + -importPackage external-dependency-manager-1.2.177.unitypackage \ -nographics \ -logFile create_unity_core.log \ -projectPath $PWD/../ \ @@ -37,13 +37,13 @@ echo "Commenting out functions. Done." Assets \ $PWD/$DEPLOY_PATH/$PACKAGE_NAME \ -quit \ - && echo "package exported successfully to outputs/appsflyer-unity-plugin-strict-mode-6.12.21.unitypackage" \ + && echo "package exported successfully to outputs/appsflyer-unity-plugin-strict-mode-6.12.22.unitypackage" \ || echo "Failed to export package. See create_unity_core.log for more info." if [ $1 == "-p" ]; then echo "moving back the external dependency manager to deploy" - mv ../external-dependency-manager-1.2.144.unitypackage . + mv ../external-dependency-manager-1.2.177.unitypackage . echo "removing ./Library" rm -rf ../Library echo "removing ./Logs" diff --git a/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.12.21.unitypackage b/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.12.21.unitypackage deleted file mode 100644 index 9de151aa..00000000 Binary files a/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.12.21.unitypackage and /dev/null differ diff --git a/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.12.22.unitypackage b/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.12.22.unitypackage new file mode 100644 index 00000000..b80a63f9 Binary files /dev/null and b/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.12.22.unitypackage differ