Merge branch 'develop' into Stable

CAAPIM · Jul 12, 2018 · 1e620ef · 1e620ef
2 parents 8184e6b + b8aca81
commit 1e620ef
Show file tree

Hide file tree

Showing 424 changed files with 111,916 additions and 4,797 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# Version 1.7.10
+
+### Bug fixes
+None.
+
+See list of bug fixes for native platforms:
+
+* iOS Mobile SDK for CA Mobile API Gateway [Change Log](https://github.com/CAAPIM/iOS-MAS-Foundation/blob/Stable/CHANGELOG.md#version-1710)
+* Android™ Mobile SDK for CA Mobile API Gateway [Change Log](https://github.com/CAAPIM/Android-MAS-SDK/blob/Stable/ChangeLog.md#version-1710)
+
+### Enhancement
+* MASFoundation.iOS updated with latest iOS 1.7.10 version
+* MASFoundation.Android updated with latest Android 1.7.10 version
+
+### Deprecated methods
+None.
+
 # Version 1.7.00
 
 ### Bug fixes

diff --git a/sample/iOS/BasicAuthSample/BasicAuthSample.csproj b/sample/iOS/BasicAuthSample/BasicAuthSample.csproj
@@ -89,10 +89,7 @@
     <Reference Include="Xamarin.iOS" />
     <Reference Include="System.Net.Http" />
     <Reference Include="MASFoundation.iOS">
-      <HintPath>packages\MASFoundation.Xamarin.1.7.0-RC54\lib\xamarin.ios\MASFoundation.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="MASFoundation.iOS">
-      <HintPath>packages\MASFoundation.Xamarin.1.7.0-RC54\lib\xamarin.ios\MASFoundation.iOS.dll</HintPath>
+      <HintPath>packages\MASFoundation.Xamarin.1.7.0\lib\xamarin.ios\MASFoundation.iOS.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/sample/iOS/BasicAuthSample/packages.config b/sample/iOS/BasicAuthSample/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MASFoundation.Xamarin" version="1.7.0-RC54" targetFramework="xamarinios10" />
+  <package id="MASFoundation.Xamarin" version="1.7.0" targetFramework="xamarinios10" />
   <package id="System.Net.Http" version="4.3.3" targetFramework="xamarinios10" />
 </packages>
diff --git a/source/MASFoundation.Android/Jars/mas-foundation-debug.aar b/source/MASFoundation.Android/Jars/mas-foundation-debug.aar
diff --git a/source/MASFoundation.Android/Jars/mas-foundation-release.aar b/source/MASFoundation.Android/Jars/mas-foundation-release.aar
diff --git a/source/MASFoundation.Android/JavaDocs/allclasses-frame.html b/source/MASFoundation.Android/JavaDocs/allclasses-frame.html
diff --git a/source/MASFoundation.Android/JavaDocs/allclasses-noframe.html b/source/MASFoundation.Android/JavaDocs/allclasses-noframe.html