Update Gradle

This commit is contained in:
Marvin W 2016-08-27 12:38:11 +02:00
parent 822baf1371
commit 38acecd7b5
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
6 changed files with 45 additions and 26 deletions

View File

@ -1 +1,38 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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 {
repositories {
jcenter()
}
}

@ -1 +1 @@
Subproject commit 3532954c3e232b5ca0ca83c4db83fd0acb42845a
Subproject commit 4d8fb82ae557562e557a4984583b0d32f55b2b34

@ -1 +1 @@
Subproject commit fc659a15ed946ea9876198a97e0a22fe804dddd4
Subproject commit 62841ac0e297972e008643c11d2c4d2477a73425

View File

@ -3,4 +3,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.application'
/* This is a hack, trying to provide release updates to F-Droid until it can properly handle Gradle
@ -52,8 +43,8 @@ int getMyVersionCode() {
}
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()