Merge branch 'integration' into dev

* integration:
  Update file with v0.10.0 changes
  update library version
  excluding android support from resulting .jar from .aar
  version bump
  Update README.md

Author: Marcos Torres

CHANGES.md

@@ -1,5 +1,28 @@
 # Office 365 SDK for Android  #
 
+### Version 0.10.0 ###
+
+*	Support for deserialization of entity subclasses	a650fb1
+*	Initial test structure for outlook services	d51911b
+* Added tests for deserializing lists and single items in the correct d… …	f445dea
+*	Updated CalendarView tests, added getCalendarView for particular cale… …	6de06e3
+* Adding new ADAL based dependency resolver	1530d5e
+* Updating sample with new ADAL based dependency resolver	54ad1f0
+* OrderBy support	bb34fc7
+* Added tests for skip and order by	08ed48e
+* Version bump	d9637b6
+*	Excluding android support from resulting .jar from .aar
+
+
+### Version 0.9.4###
+
+* Library consolidation into a new package : odata-engine-core
+* projection and expansion support for single entities ($expand and $select)
+* Fixed issue with custom headers that were not being added properly
+* Updated ADAL version to use (,2.0)
+* Removed CredentialsFactory interface
+* Added tests for CalendarView functions
+
 ### Version 0.9.3###
 
 * Excluding third party dependencies when creating .jar artifact. issue #45

README.md

@@ -5,6 +5,7 @@
 - [Overview](#overview)
 - [Quick start](#quick-start)
 - [Samples](#samples)
+- [FAQs](#faqs)
 - [Contributing](#contributing)
 - [License](#license)
 
@@ -29,15 +30,15 @@ Now we'll create a simple application that retrieves messages using this SDK and
 ```Groovy
 dependencies {
     // base OData stuff:
-    compile group: 'com.microsoft.services', name: 'odata-engine-core', version: '0.9.4'
-    compile group: 'com.microsoft.services', name: 'odata-engine-android-impl', version: '0.9.4', ext:'aar'
+    compile group: 'com.microsoft.services', name: 'odata-engine-core', version: '0.10.0'
+    compile group: 'com.microsoft.services', name: 'odata-engine-android-impl', version: '0.10.0', ext:'aar'
 
     // choose the services/SDKs you need:
-    compile group: 'com.microsoft.services', name: 'outlook-services', version: '0.9.4'
-    compile group: 'com.microsoft.services', name: 'discovery-services', version: '0.9.4'
-    compile group: 'com.microsoft.services', name: 'directory-services', version: '0.9.4'
-    compile group: 'com.microsoft.services', name: 'file-services', version: '0.9.4'
-    compile group: 'com.microsoft.services', name: 'list-services', version: '0.9.4', ext:'aar'
+    compile group: 'com.microsoft.services', name: 'outlook-services', version: '0.10.0'
+    compile group: 'com.microsoft.services', name: 'discovery-services', version: '0.10.0'
+    compile group: 'com.microsoft.services', name: 'directory-services', version: '0.10.0'
+    compile group: 'com.microsoft.services', name: 'file-services', version: '0.10.0'
+    compile group: 'com.microsoft.services', name: 'list-services', version: '0.10.0', ext:'aar'
     
     // ADAL
     compile (group: 'com.microsoft.aad', name: 'adal', version: '(,2.0)') {
@@ -95,6 +96,13 @@ Futures.addCallback(messagesFuture, new FutureCallback<List<Message>>() {
 ## Samples
 Currently we have a simple sample in the Samples folder using Outlook Services to retrieve mail and calendar events. Look for more samples soon.
 
+## FAQs
+
+* [How to use CalendarView?](https://github.com/OfficeDev/Office-365-SDK-for-Android/wiki/Using-Calendar-View)
+* [How to build SDK using Eclipse?](https://github.com/OfficeDev/Office-365-SDK-for-Android/wiki/Eclipse-build-instructions)
+* [How to handle ETags and Optimistic Concurrency?](https://github.com/OfficeDev/Office-365-SDK-for-Android/wiki/ETags-and-Optimistic-Concurrency)
+* [Known Issues](https://github.com/OfficeDev/Office-365-SDK-for-Android/wiki/Known-Issues)
+
 ## Contributing
 You will need to sign a [Contributor License Agreement](https://cla.msopentech.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the form and then electronically sign the Contributor License Agreement when you receive the email containing the link to the document. This needs to only be done once for any Microsoft Open Technologies OSS project.
 

sdk/android-libraries.gradle

@@ -28,7 +28,8 @@ android.libraryVariants.all { variant ->
         it.getName() != 'android.jar' &&
         //manually removing dependencies. .jar consumers will need to fulfill these dependencies
         !it.getName().startsWith('guava') &&
-        !it.getName().startsWith('gson')
+        !it.getName().startsWith('gson')  &&
+        !it.getName().startsWith('support')
 
     }.collect {
         it.isDirectory() ? it : zipTree(it)

sdk/build.gradle

@@ -19,5 +19,5 @@ allprojects {
 
     apply plugin: 'idea'
     group = 'com.microsoft.services'
-    version = '0.9.4'
+    version = '0.10.0'
 }

sdk/file-services/build.gradle

@@ -5,7 +5,7 @@ dependencies {
 }
 
 ext {
-    PUBLISH_VERSION = '0.9.4'
+    PUBLISH_VERSION = '0.10.0'
     PUBLISH_GROUP_ID = 'com.microsoft.services'
 }