Update Gradle and Sublib

This commit is contained in:
Marvin W 2016-08-27 12:46:12 +02:00
parent 310127db79
commit c450e2d8ad
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
11 changed files with 35 additions and 92 deletions

View File

@ -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'

2
extern/GmsApi vendored

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

View File

@ -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

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()

View File

@ -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
buildToolsVersion "23.0.3"
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()