Update Gradle and Sublib

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright 2013-2016 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,22 @@
  * limitations under the License.
  */
 
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+    }
+}
+
+allprojects {
+    apply plugin: 'idea'
+    ext.androidBuildVersionTools = "23.0.3"
+}
+
+def androidCompileSdk() { return 23 }
 
 subprojects {
     group = 'org.microg'

extern/GmsApi

@@ -1 +1 @@
-Subproject commit b9cb95d39bdb4bbac6dd0d2b0405e4d5a23717c2
+Subproject commit c6f5d25850d86a78119c0175678c81178b0500e1

gradle/wrapper/gradle-wrapper.properties

@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

play-services-base/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services-cast/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services-gcm/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services-iid/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services-location/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services-tasks/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services-wearable/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()

play-services/build.gradle

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 String getMyVersionName() {
@@ -35,8 +26,8 @@ String getMyVersionName() {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion androidCompileSdk()
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
         versionName getMyVersionName()