Skip to content

Commit

Permalink
Merge pull request #237 from adjust/v4295
Browse files Browse the repository at this point in the history
Version 4.29.5
  • Loading branch information
uerceg authored Dec 7, 2021
2 parents 8b6b222 + 8287222 commit 6fb552d
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 10 deletions.
2 changes: 1 addition & 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.4";
private const string sdkPrefix = "unity4.29.5";
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
Binary file modified Assets/Adjust/Android/Test/adjust-test-library.aar
Binary file not shown.
Binary file modified Assets/Adjust/Android/Test/adjust-test-options.aar
Binary file not shown.
Binary file modified Assets/Adjust/Android/adjust-android.jar
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/Adjust/Test/CommandExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,16 @@ private void Config()
adjustConfig.allowIdfaReading = allowIdfaReading;
}

if (_command.ContainsParameter("allowSkAdNetworkHandling"))
{
var allowSkAdNetworkHandlingS = _command.GetFirstParameterValue("allowSkAdNetworkHandling");
var allowSkAdNetworkHandling = allowSkAdNetworkHandlingS.ToLower() == "true";
if (allowSkAdNetworkHandling == false)
{
adjustConfig.deactivateSKAdNetworkHandling();
}
}

if (_command.ContainsParameter("userAgent"))
{
var userAgent = _command.GetFirstParameterValue("userAgent");
Expand Down
4 changes: 2 additions & 2 deletions Assets/Adjust/Test/TestApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public class TestApp : MonoBehaviour
#elif UNITY_ANDROID
private const string PORT = ":8443";
private const string PROTOCOL = "https://";
private const string IP = "192.168.86.32";
private const string IP = "192.168.86.80";
#elif UNITY_IOS
private const string PORT = ":8080";
private const string PROTOCOL = "http://";
private const string IP = "192.168.86.32";
private const string IP = "192.168.86.80";
private TestLibraryiOS _testLibraryiOS;
#endif
private const string BASE_URL = PROTOCOL + IP + PORT;
Expand Down
1 change: 1 addition & 0 deletions Assets/Adjust/Unity/AdjustConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class AdjustConfig
public const string AdjustAdRevenueSourceMopub = "mopub";
public const string AdjustAdRevenueSourceAdMob = "admob_sdk";
public const string AdjustAdRevenueSourceIronSource = "ironsource_sdk";
public const string AdjustAdRevenueSourceAdmost = "admost_sdk";

internal string appToken;
internal string sceneName;
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.4";
private const string sdkPrefix = "unity4.29.5";
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.5
// V4.29.6
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
//
Expand Down Expand Up @@ -48,6 +48,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceAppLovinMAX;
extern NSString * __nonnull const ADJAdRevenueSourceMopub;
extern NSString * __nonnull const ADJAdRevenueSourceAdMob;
extern NSString * __nonnull const ADJAdRevenueSourceIronSource;
extern NSString * __nonnull const ADJAdRevenueSourceAdMost;

/**
* Constants for country app's URL strategies.
Expand Down
Binary file modified Assets/Adjust/iOS/AdjustSdk.a
Binary file not shown.
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.4";
private const string sdkPrefix = "unity4.29.5";

[DllImport("__Internal")]
private static extern void _AdjustLaunchApp(
Expand Down
Binary file modified Assets/Adjust/iOS/Test/AdjustTestLibrary.a
Binary file not shown.
Binary file modified Assets/AdjustOaid/Android/adjust-android-oaid.jar
Binary file not shown.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
### Version 4.29.5 (7th December 2021)
#### Added
- Added support for Admost ad revenue tracking.

#### Native SDKs
- [[email protected]][ios_sdk_v4.29.6]
- [[email protected]][android_sdk_v4.28.8]

---

### Version 4.29.4 (7th September 2021)
#### Added
- Added support to OAID plugin for MSA SDK v1.0.26.
Expand Down Expand Up @@ -947,6 +957,7 @@
[ios_sdk_v4.29.2]: https://github.com/adjust/ios_sdk/tree/v4.29.2
[ios_sdk_v4.29.3]: https://github.com/adjust/ios_sdk/tree/v4.29.3
[ios_sdk_v4.29.5]: https://github.com/adjust/ios_sdk/tree/v4.29.5
[ios_sdk_v4.29.6]: https://github.com/adjust/ios_sdk/tree/v4.29.6

[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 @@ -984,6 +995,7 @@
[android_sdk_v4.28.2]: https://github.com/adjust/android_sdk/tree/v4.28.2
[android_sdk_v4.28.3]: https://github.com/adjust/android_sdk/tree/v4.28.3
[android_sdk_v4.28.4]: https://github.com/adjust/android_sdk/tree/v4.28.4
[android_sdk_v4.28.8]: https://github.com/adjust/android_sdk/tree/v4.28.8

[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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.29.4
4.29.5
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.4 from 3.4.4
## Migrate your Adjust SDK for Unity3d to 4.29.5 from 3.4.4

### Migration procedure

Expand Down
2 changes: 1 addition & 1 deletion ext/android/sdk
Submodule sdk updated 63 files
+4 −4 Adjust/build.gradle
+10 −5 Adjust/example-app-fbpixel/build.gradle
+3 −1 Adjust/example-app-fbpixel/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-java/build.gradle
+3 −1 Adjust/example-app-java/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-keyboard/build.gradle
+5 −2 Adjust/example-app-keyboard/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-kotlin/build.gradle
+3 −1 Adjust/example-app-kotlin/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-tv/build.gradle
+3 −1 Adjust/example-app-tv/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-webbridge/build.gradle
+3 −1 Adjust/example-app-webbridge/src/main/AndroidManifest.xml
+1 −1 Adjust/gradle/wrapper/gradle-wrapper.properties
+32 −15 Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
+6 −0 Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityState.java
+26 −8 Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
+4 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java
+3 −2 Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
+2 −2 Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrer.java
+82 −11 Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrerHuawei.java
+1 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrerReadListener.java
+16 −8 Adjust/sdk-core/src/main/java/com/adjust/sdk/Util.java
+38 −0 Adjust/sdk-core/src/main/java/com/adjust/sdk/scheduler/AsyncTaskExecutor.java
+1 −1 Adjust/sdk-plugin-criteo/build.gradle
+1 −1 Adjust/sdk-plugin-imei/build.gradle
+43 −6 Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java
+1 −1 Adjust/sdk-plugin-oaid/build.gradle
+0 −1 Adjust/sdk-plugin-play/.gitignore
+0 −20 Adjust/sdk-plugin-play/build.gradle
+0 −21 Adjust/sdk-plugin-play/proguard-rules.pro
+0 −2 Adjust/sdk-plugin-play/src/main/AndroidManifest.xml
+0 −194 Adjust/sdk-plugin-play/src/main/java/com/adjust/sdk/play/InstallReferrer.java
+0 −45 Adjust/sdk-plugin-play/src/main/java/com/adjust/sdk/play/Util.java
+0 −3 Adjust/sdk-plugin-play/src/main/res/values/strings.xml
+1 −1 Adjust/sdk-plugin-sociomantic/build.gradle
+1 −1 Adjust/sdk-plugin-trademob/build.gradle
+1 −1 Adjust/sdk-plugin-webbridge/build.gradle
+1 −1 Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
+1 −1 Adjust/settings.gradle
+10 −5 Adjust/test-app-core/build.gradle
+3 −1 Adjust/test-app-core/src/main/AndroidManifest.xml
+5 −5 Adjust/test-app-webbridge/build.gradle
+3 −1 Adjust/test-app-webbridge/src/main/AndroidManifest.xml
+5 −5 Adjust/test-kotlin/build.gradle
+2 −1 Adjust/test-kotlin/src/main/AndroidManifest.xml
+2 −2 Adjust/test-library/build.gradle
+2 −2 Adjust/test-options/build.gradle
+6 −6 Adjust/test-unit/build.gradle
+1 −1 Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
+3 −1 Adjust/test-unit/src/main/AndroidManifest.xml
+28 −0 CHANGELOG.md
+16 −7 README.md
+1 −1 VERSION
+12 −2 doc/chinese/README.md
+2 −2 doc/chinese/plugins/oaid.md
+1 −1 doc/english/migration/migrate.md
+2 −2 doc/english/plugins/oaid.md
+12 −2 doc/japanese/README.md
+1 −1 doc/japanese/migration/migrate.md
+2 −2 doc/japanese/plugins/oaid.md
+12 −2 doc/korean/README.md
+2 −2 doc/korean/plugins/oaid.md

0 comments on commit 6fb552d

Please sign in to comment.