Skip to content

Commit

Permalink
Merge pull request #220 from adjust/v4291
Browse files Browse the repository at this point in the history
Version 4.29.1
  • Loading branch information
uerceg authored May 12, 2021
2 parents d37eaec + 34cd3e1 commit c2e4b5d
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 12 deletions.
7 changes: 6 additions & 1 deletion Assets/Adjust/Android/AdjustAndroid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace com.adjust.sdk
#if UNITY_ANDROID
public class AdjustAndroid
{
private const string sdkPrefix = "unity4.29.0";
private const string sdkPrefix = "unity4.29.1";
private static bool launchDeferredDeeplink = true;
private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
Expand Down Expand Up @@ -145,6 +145,11 @@ public static void Start(AdjustConfig adjustConfig)
AndroidJavaObject ajoDataResidencyTR = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_TR");
ajoAdjustConfig.Call("setUrlStrategy", ajoDataResidencyTR);
}
else if (adjustConfig.urlStrategy == AdjustConfig.AdjustDataResidencyUS)
{
AndroidJavaObject ajoDataResidencyUS = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_US");
ajoAdjustConfig.Call("setUrlStrategy", ajoDataResidencyUS);
}
}

// Check if user has set app secret.
Expand Down
Binary file modified Assets/Adjust/Android/adjust-android.jar
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/Adjust/Unity/AdjustConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class AdjustConfig

public const string AdjustDataResidencyEU = "data-residency-eu";
public const string AdjustDataResidencyTR = "data-residency-tr";
public const string AdjustDataResidencyUS = "data-residency-us";

public const string AdjustAdRevenueSourceAppLovinMAX = "applovin_max_sdk";
public const string AdjustAdRevenueSourceMopub = "mopub";
Expand Down
2 changes: 1 addition & 1 deletion Assets/Adjust/Windows/AdjustWindows.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace com.adjust.sdk
{
public class AdjustWindows
{
private const string sdkPrefix = "unity4.29.0";
private const string sdkPrefix = "unity4.29.1";
private static bool appLaunched = false;

public static void Start(AdjustConfig adjustConfig)
Expand Down
3 changes: 2 additions & 1 deletion Assets/Adjust/iOS/Adjust.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Adjust.h
// Adjust SDK
//
// V4.29.0
// V4.29.2
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
//
Expand Down Expand Up @@ -55,6 +55,7 @@ extern NSString * __nonnull const ADJUrlStrategyIndia;
extern NSString * __nonnull const ADJUrlStrategyChina;
extern NSString * __nonnull const ADJDataResidencyEU;
extern NSString * __nonnull const ADJDataResidencyTR;
extern NSString * __nonnull const ADJDataResidencyUS;

/**
* @brief The main interface to Adjust.
Expand Down
Binary file modified Assets/Adjust/iOS/AdjustSdk.a
Binary file not shown.
2 changes: 2 additions & 0 deletions Assets/Adjust/iOS/AdjustUnity.mm
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ void _AdjustLaunchApp(const char* appToken,
[adjustConfig setUrlStrategy:ADJDataResidencyEU];
} else if ([stringUrlStrategy isEqualToString:@"data-residency-tr"]) {
[adjustConfig setUrlStrategy:ADJDataResidencyTR];
} else if ([stringUrlStrategy isEqualToString:@"data-residency-us"]) {
[adjustConfig setUrlStrategy:ADJDataResidencyUS];
}
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/Adjust/iOS/AdjustiOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace com.adjust.sdk
#if UNITY_IOS
public class AdjustiOS
{
private const string sdkPrefix = "unity4.29.0";
private const string sdkPrefix = "unity4.29.1";

[DllImport("__Internal")]
private static extern void _AdjustLaunchApp(
Expand Down
Binary file modified Assets/AdjustOaid/Android/adjust-android-oaid.jar
Binary file not shown.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
### Version 4.29.1 (13th May 2021)
#### Added
- [beta] Added data residency support for US region. You can choose this setting by calling `setUrlStrategy` method of `AdjustConfig` instance with `AdjustConfig.AdjustDataResidencyUS` parameter.

#### Fixed
- Removed 5 decimal places formatting for ad revenue value.

#### Native SDKs
- [[email protected]][ios_sdk_v4.29.2]
- [[email protected]][android_sdk_v4.28.1]
- [[email protected]][windows_sdk_v4.17.0]

---

### Version 4.29.0 (27th April 2021)
#### Added
- Added `conversionValueUpdatedDelegate` callback to `AdjustConfig` which can be used to get information when Adjust SDK updates conversion value for the user.
Expand All @@ -8,6 +22,11 @@
#### Changed
- Removed unused ad revenue constants.

#### Native SDKs
- [[email protected]][ios_sdk_v4.29.0]
- [[email protected]][android_sdk_v4.28.0]
- [[email protected]][windows_sdk_v4.17.0]

---

### Version 4.28.0 (1th April 2021)
Expand Down Expand Up @@ -892,6 +911,8 @@
[ios_sdk_v4.26.2]: https://github.com/adjust/ios_sdk/tree/v4.26.2
[ios_sdk_v4.27.1]: https://github.com/adjust/ios_sdk/tree/v4.27.1
[ios_sdk_v4.28.0]: https://github.com/adjust/ios_sdk/tree/v4.28.0
[ios_sdk_v4.29.0]: https://github.com/adjust/ios_sdk/tree/v4.29.0
[ios_sdk_v4.29.2]: https://github.com/adjust/ios_sdk/tree/v4.29.2

[android_sdk_v3.5.0]: https://github.com/adjust/android_sdk/tree/v3.5.0
[android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0
Expand Down Expand Up @@ -924,6 +945,8 @@
[android_sdk_v4.25.0]: https://github.com/adjust/android_sdk/tree/v4.25.0
[android_sdk_v4.26.1]: https://github.com/adjust/android_sdk/tree/v4.26.1
[android_sdk_v4.27.0]: https://github.com/adjust/android_sdk/tree/v4.27.0
[android_sdk_v4.28.0]: https://github.com/adjust/android_sdk/tree/v4.28.0
[android_sdk_v4.28.1]: https://github.com/adjust/android_sdk/tree/v4.28.1

[windows_sdk_v4.12.0]: https://github.com/adjust/windows_sdk/tree/v4.12.0
[windows_sdk_v4.13.0]: https://github.com/adjust/windows_sdk/tree/v4.13.0
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1171,11 +1171,12 @@ Upon receiving this information, Adjust changes sharing the specific user's data

### <a id="ad-data-residency"></a>[beta] Data residency

In order to enable data residency feature, make sure to make a call to `setUrlStrategy:` method of the `ADJConfig` instance with one of the following constants:
In order to enable data residency feature, make sure to make a call to `setUrlStrategy` method of the `AdjustConfig` instance with one of the following constants:

```objc
adjustConfig.setUrlStrategy(AdjustConfig.AdjustDataResidencyEU); // for EU data residency region
adjustConfig.setUrlStrategy(AdjustConfig.AdjustDataResidencyTR); // for Turkey data residency region
adjustConfig.setUrlStrategy(AdjustConfig.AdjustDataResidencyUS); // for US data residency region
```

**Note:** This feature is currently in beta testing phase. If you are interested in getting access to it, please contact your dedicated account manager or write an email to [email protected]. Please, do not turn this setting on before making sure with the support team that this feature is enabled for your app because otherwise SDK traffic will get dropped.
Expand Down Expand Up @@ -1210,7 +1211,7 @@ If needed, disable dSYM File. In the `Project Navigator`, select the `Unity-iPho
[android-deeplinking]: https://github.com/adjust/android_sdk#deep-linking
[google_play_services]: http://developer.android.com/google/play-services/setup.html
[android_sdk_download]: https://developer.android.com/sdk/index.html#Other
[install-referrer-aar]: https://maven.google.com/com/android/installreferrer/installreferrer/1.0/installreferrer-1.0.aar
[install-referrer-aar]: https://maven.google.com/com/android/installreferrer/installreferrer/2.2/installreferrer-2.2.aar
[android-custom-receiver]: https://github.com/adjust/android_sdk/blob/master/doc/english/referrer.md

[menu_android]: https://raw.github.com/adjust/adjust_sdk/master/Resources/unity/v4/menu_android.png
Expand All @@ -1221,15 +1222,15 @@ If needed, disable dSYM File. In the `Project Navigator`, select the `Unity-iPho

## License

### <a id="license"></a>License agreement
### <a id="license"></a>License

The file mod_pbxproj.py is licensed under the Apache License, Version 2.0 (the "License").
You may not use this file except in compliance with the License.
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

The Adjust SDK is licensed under the MIT License.

Copyright (c) 2012-2020 Adjust GmbH, http://www.adjust.com
Copyright (c) 2012-2021 Adjust GmbH, http://www.adjust.com

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.29.0
4.29.1
2 changes: 1 addition & 1 deletion doc/english/migration/migrate.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Migrate your Adjust SDK for Unity3d to 4.29.0 from 3.4.4
## Migrate your Adjust SDK for Unity3d to 4.29.1 from 3.4.4

### Migration procedure

Expand Down

0 comments on commit c2e4b5d

Please sign in to comment.