Skip to content

Commit

Permalink
Merge pull request #90 from adjust/v4102
Browse files Browse the repository at this point in the history
Version 4.10.2
  • Loading branch information
uerceg authored Oct 31, 2016
2 parents 786f910 + 1f1c9a2 commit 29ffb53
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 20 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 : IAdjust {
#region Fields
private const string sdkPrefix = "unity4.10.1";
private const string sdkPrefix = "unity4.10.2";

private static bool launchDeferredDeeplink = true;

Expand Down
14 changes: 7 additions & 7 deletions Assets/Adjust/ExampleGUI/ExampleGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,31 +121,31 @@ public void AttributionChangedCallback(AdjustAttribution attributionData) {
Debug.Log("Attribution changed!");

if (attributionData.trackerName != null) {
Debug.Log("trackerName " + attributionData.trackerName);
Debug.Log("Tracker name " + attributionData.trackerName);
}

if (attributionData.trackerToken != null) {
Debug.Log("trackerToken " + attributionData.trackerToken);
Debug.Log("Tracker token " + attributionData.trackerToken);
}

if (attributionData.network != null) {
Debug.Log("network " + attributionData.network);
Debug.Log("Network " + attributionData.network);
}

if (attributionData.campaign != null) {
Debug.Log("campaign " + attributionData.campaign);
Debug.Log("Campaign " + attributionData.campaign);
}

if (attributionData.adgroup != null) {
Debug.Log("adgroup " + attributionData.adgroup);
Debug.Log("Adgroup " + attributionData.adgroup);
}

if (attributionData.creative != null) {
Debug.Log("creative " + attributionData.creative);
Debug.Log("Creative " + attributionData.creative);
}

if (attributionData.clickLabel != null) {
Debug.Log("clickLabel" + attributionData.clickLabel);
Debug.Log("Click label " + attributionData.clickLabel);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/Adjust/Metro/AdjustMetro.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace com.adjust.sdk {
public class AdjustMetro : IAdjust {
private const string sdkPrefix = "unity4.10.1";
private const string sdkPrefix = "unity4.10.2";

public bool isEnabled() {
return AdjustWS.IsEnabled();
Expand Down
2 changes: 1 addition & 1 deletion Assets/Adjust/WP8/AdjustWP8.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace com.adjust.sdk {
public class AdjustWP8 : IAdjust {
private const string sdkPrefix = "unity4.10.1";
private const string sdkPrefix = "unity4.10.2";

public bool isEnabled() {
return AdjustWP.IsEnabled();
Expand Down
33 changes: 31 additions & 2 deletions Assets/Adjust/iOS/AdjustUnity.mm
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,37 @@ - (id)init {
}

- (void)adjustAttributionChanged:(ADJAttribution *)attribution {
NSDictionary *dicAttribution = [attribution dictionary];
NSData *dataAttribution = [NSJSONSerialization dataWithJSONObject:dicAttribution options:0 error:nil];
NSMutableDictionary *attributionDic = [NSMutableDictionary dictionary];

if (nil != attribution.trackerToken) {
[attributionDic setObject:attribution.trackerToken forKey:@"trackerToken"];
}

if (nil != attribution.trackerName) {
[attributionDic setObject:attribution.trackerName forKey:@"trackerName"];
}

if (nil != attribution.network) {
[attributionDic setObject:attribution.network forKey:@"network"];
}

if (nil != attribution.campaign) {
[attributionDic setObject:attribution.campaign forKey:@"campaign"];
}

if (nil != attribution.adgroup) {
[attributionDic setObject:attribution.adgroup forKey:@"adgroup"];
}

if (nil != attribution.creative) {
[attributionDic setObject:attribution.creative forKey:@"creative"];
}

if (nil != attribution.clickLabel) {
[attributionDic setObject:attribution.clickLabel forKey:@"clickLabel"];
}

NSData *dataAttribution = [NSJSONSerialization dataWithJSONObject:attributionDic options:0 error:nil];
NSString *stringAttribution = [[NSString alloc] initWithBytes:[dataAttribution bytes]
length:[dataAttribution length]
encoding:NSUTF8StringEncoding];
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 : IAdjust {
#region Fields
private const string sdkPrefix = "unity4.10.1";
private const string sdkPrefix = "unity4.10.2";
#endregion

#region External methods
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
### Version 4.10.2 (31st October 2016)
#### Fixed
- Fixed wrong click label parameter name which was causing this parameter to be empty in iOS.

---

### Version 4.10.1 (13th October 2016)
#### Changed
- Updated Native iOS SDK to version **4.10.2**.
- Updated Native Android SDK to version **4.10.2**.

---

### Version 4.10.0 (15th September 2016)
#### Added
- Added possibility to set session callback and partner parameters on `Adjust` instance with `addSessionCallbackParameter` and `addSessionPartnerParameter` methods.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ These are the minimal steps required to integrate the adjust SDK into your Unity

Download the latest version from our [releases page][releases]. In there you will find two Unity packages:

* **Adjust_v4.10.1_Unity_4.unitypackage** - Use this package if you are using **Unity IDE version 4**.
* **Adjust_v4.10.1_Unity_5.unitypackage** - Use this package if you are using **Unity IDE version 5**.
* **Adjust_v4.10.2_Unity_4.unitypackage** - Use this package if you are using **Unity IDE version 4**.
* **Adjust_v4.10.2_Unity_5.unitypackage** - Use this package if you are using **Unity IDE version 5**.

### <a id="sdk-add">Add the SDK to your project

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.10.1
4.10.2
8 changes: 4 additions & 4 deletions doc/migrate.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Migrate your adjust SDK for Unity3d to 4.10.1 from 3.4.4
## Migrate your adjust SDK for Unity3d to 4.10.2 from 3.4.4

### Migration procedure

Expand All @@ -9,12 +9,12 @@ keeping in `Assets/Plugins` folder.

For migration purposes, we have prepared two Unity packages:

* `Adjust_v4.10.1_Unity_4.unitypackage` (for Unity 4 users)
* `Adjust_v4.10.1_Unity_5.unitypackage` (for Unity 5 users)
* `Adjust_v4.10.2_Unity_4.unitypackage` (for Unity 4 users)
* `Adjust_v4.10.2_Unity_5.unitypackage` (for Unity 5 users)

and the adjust SDK uninstall script written in Python (`adjust_uninstall.py`).

Migration to version 4.10.0 of our SDK requires the following steps:
Migration to version 4.10.2 of our SDK requires the following steps:

1. Copy the `adjust_uninstall.py` script to your root Unity project directory and run it. This script should
delete all adjust source files from the previous SDK version you had.
Expand Down

0 comments on commit 29ffb53

Please sign in to comment.