Merge pull request #12 from adjust/v4110

Version 4.11.0
adjust · Jan 5, 2017 · 970e1bb · 970e1bb
2 parents b2ce647 + e4c9401
commit 970e1bb
Show file tree

Hide file tree

Showing 13 changed files with 284 additions and 390 deletions.
diff --git a/Android/AdjustSdk.Xamarin.Android/Jars/adjust-android.jar b/Android/AdjustSdk.Xamarin.Android/Jars/adjust-android.jar
diff --git a/Android/AdjustSdk.Xamarin.Android/Properties/AssemblyInfo.cs b/Android/AdjustSdk.Xamarin.Android/Properties/AssemblyInfo.cs
@@ -18,7 +18,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("4.10.1")]
+[assembly: AssemblyVersion("4.11.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

diff --git a/Android/Example/Example.csproj b/Android/Example/Example.csproj
@@ -43,14 +43,17 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
+    <Reference Include="Xamarin.Android.Support.v4">
+      <HintPath>..\packages\Xamarin.Android.Support.v4.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+    </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Basement">
       <HintPath>..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Analytics">
       <HintPath>..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\packages\Xamarin.Android.Support.v4.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="AdjustSdk.Xamarin.Android">
+      <HintPath>..\AdjustSdk.Xamarin.Android\bin\Release\AdjustSdk.Xamarin.Android.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -78,12 +81,6 @@
     <AndroidResource Include="Resources\values\Strings.xml" />
     <AndroidResource Include="Resources\layout\Main.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AdjustSdk.Xamarin.Android\AdjustSdk.Xamarin.Android.csproj">
-      <Project>{5A410FCF-04C7-4F1B-ACD8-F87A2E205528}</Project>
-      <Name>AdjustSdk.Xamarin.Android</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
 </Project>
diff --git a/Android/ext/sdk b/Android/ext/sdk
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+### Version 4.11.0 (5th January 2017)
+#### Added
+- Added `Adid` property to the attribution callback response.
+- Added property `Adjust.Adid` to be able to get adid value at any time after obtaining it, not only when session/event callbacks have been triggered.
+- Added property `Adjust.Attribution` to be able to get current attribution value at any time after obtaining it, not only when attribution callback has been triggered.
+- Added sending of **Amazon Fire Advertising Identifier** for Android platform.
+- Added possibility to set default tracker for the app by adding `adjust_config.properties` file to the `assets` folder of your app. Mostly meant to be used by the `Adjust Store & Pre-install Tracker Tool` (https://github.com/adjust/android_sdk/blob/master/doc/english/pre_install_tracker_tool.md).
+
+#### Fixed
+- Now reading push token value from activity state file when sending package.
+- Fixed memory leak by closing network session for iOS platform.
+- Fixed `TARGET_OS_TV` pre processer check for iOS platform.
+
+#### Changed
+- Firing attribution request as soon as install has been tracked, regardless of presence of attribution callback implementation in user's app.
+- Saving iAd/AdSearch details to prevent sending duplicated `sdk_click` packages for iOS platform.
+- Updated docs.
+- Updated native iOS SDK to version **4.11.0**.
+- Native SDKs stability updates and improvements.
+
+---
+
 ### Version 4.10.1 (15th December 2016)
 #### Fixed
 - Deferred deep link arrival to the app is no longer dependent from implementation of the attribution callback.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.10.1
+4.11.0
diff --git a/doc/android/android.md b/doc/android/android.md
diff --git a/doc/ios/ios.md b/doc/ios/ios.md
diff --git a/iOS/AdjustSdk.Xamarin.iOS/ApiDefinition.cs b/iOS/AdjustSdk.Xamarin.iOS/ApiDefinition.cs
@@ -41,6 +41,12 @@ public interface Adjust
 		[Static, Export("idfa")]
 		string Idfa { get; }
 
+		[Static, Export("adid")]
+		string Adid { get; }
+
+		[Static, Export("attribution")]
+		ADJAttribution Attribution { get; }
+
 		[Static, Export("sendFirstPackages")]
 		void SendFirstPackages();
 
@@ -189,6 +195,9 @@ public interface ADJAttribution : INSCoding, INSCopying
 		[Export("clickLabel")]
 		string ClickLabel { get; set; }
 
+		[Export("adid")]
+		string Adid { get; set; }
+
 		[Static, Export("dataWithJsonDict:")]
 		ADJAttribution DataWithJsonDict(NSDictionary jsonDict);
 

diff --git a/iOS/AdjustSdk.Xamarin.iOS/Properties/AssemblyInfo.cs b/iOS/AdjustSdk.Xamarin.iOS/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("4.10.1")]
+[assembly: AssemblyVersion("4.11.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

diff --git a/iOS/AdjustSdk.Xamarin.iOS/Resources/libAdjust.a b/iOS/AdjustSdk.Xamarin.iOS/Resources/libAdjust.a
diff --git a/iOS/Example/Example.csproj b/iOS/Example/Example.csproj
@@ -92,6 +92,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="AdjustSdk.Xamarin.iOS">
+      <HintPath>..\AdjustSdk.Xamarin.iOS\bin\Debug\AdjustSdk.Xamarin.iOS.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -116,11 +119,5 @@
       <DependentUpon>ViewController.cs</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AdjustSdk.Xamarin.iOS\AdjustSdk.Xamarin.iOS.csproj">
-      <Project>{6736B825-A5A2-4F17-B08A-B6D2A6BDD08F}</Project>
-      <Name>AdjustSdk.Xamarin.iOS</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/iOS/ext/sdk b/iOS/ext/sdk