-> Update to gradle 1.5.0

-> add the lines to compile the project with Matrix SDK as a part of the project instead of a third party lib.
Theses lines are commented by default.

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'com.google.gms:google-services:1.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

settings.gradle

@@ -1 +1,6 @@
 include ':vector'
+
+
+// uncomment theses lines to compile matrix SDK as project sources instead of external lib
+//include ':matrix-sdk'
+//project(':matrix-sdk').projectDir = new File(settingsDir, '../matrix-android-sdk/matrix-sdk')

vector/build.gradle

@@ -117,8 +117,16 @@ dependencies {
 
     compile 'com.commonsware.cwac:anddown:0.2.+'
 
+    /************* Matrix SDK management **************/
+    // use the matrix SDK as external lib
     compile(name: 'matrix-sdk', ext: 'aar')
 
+    // use the matrix SDK as a part of the project
+    // you have to uncomment some lines in settings.gradle
+    //compile project(':matrix-sdk')
+
+    /************* flavors management **************/
+
     // app flavor only
     appCompile 'com.google.android.gms:play-services-gcm:8.1.0'
     appCompile 'com.google.android.gms:play-services-analytics:8.1.0'