Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Releases/6.x.x/6.12.x/6.12.22 rc1 #251

Merged
merged 7 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:"
Expand Down
2 changes: 1 addition & 1 deletion Assets/AppsFlyer/AppsFlyer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<androidPackages>
<androidPackage spec="com.appsflyer:af-android-sdk:6.12.2">
</androidPackage>
<androidPackage spec="com.appsflyer:unity-wrapper:6.12.21">
<androidPackage spec="com.appsflyer:unity-wrapper:6.12.22">
</androidPackage>
<androidPackage spec="com.android.installreferrer:installreferrer:2.1">
</androidPackage>
Expand Down
22 changes: 22 additions & 0 deletions Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// AFUnityUtils.h
//
// Created by Andrii H. and Dmitry O. on 16 Oct 2023
//

#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
#import <AppsFlyerLib/AppsFlyerLib.h>
#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<NSString*> *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);

27 changes: 27 additions & 0 deletions Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.h.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions Assets/AppsFlyer/Plugins/iOS/AFUnityUtils.mm
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
// Created by Jonathan Wesfield on 24/07/2019.
//

#if __has_include(<AppsFlyerLib/AppsFlyerLib.h>)
#import <AppsFlyerLib/AppsFlyerLib.h>
#else
#import "AppsFlyerLib.h"
#endif

#import "AFUnityUtils.h"

static NSString* stringFromChar(const char *str) {
return str ? [NSString stringWithUTF8String:str] : nil;
Expand Down
2 changes: 1 addition & 1 deletion Assets/AppsFlyer/Plugins/iOS/AppsFlyeriOSWrapper.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Assets/AppsFlyer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions android-unity-wrapper/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";

Expand Down
Binary file removed appsflyer-unity-plugin-6.12.21.unitypackage
Binary file not shown.
Binary file added appsflyer-unity-plugin-6.12.22.unitypackage
Binary file not shown.
12 changes: 6 additions & 6 deletions deploy/build_unity_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@ 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/../ \
-exportPackage \
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"
Expand Down
Binary file not shown.
Binary file not shown.
12 changes: 6 additions & 6 deletions deploy/strict_mode_build_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,24 +26,24 @@ 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/../ \
-exportPackage \
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"
Expand Down
Binary file not shown.
Binary file not shown.
Loading