Updated gradle build version and dependencies.

This commit is contained in:
Armin Novak 2018-01-17 12:03:05 +01:00
parent e81b554aba
commit 91280b3ea5
4 changed files with 18 additions and 26 deletions

View File

@ -1,15 +1,15 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion = rootProject.ext.compileSdk
buildToolsVersion = rootProject.ext.buildToolsVersion
compileSdkVersion = 27
buildToolsVersion = "27.0.3"
defaultConfig {
applicationId "com.freerdp.afreerdp"
minSdkVersion rootProject.ext.minSdk
targetSdkVersion rootProject.ext.targetSdk
minSdkVersion 14
targetSdkVersion 27
vectorDrawables.useSupportLibrary = true
versionCode = rootProject.ext.versionCode
versionCode = 12
versionName = rootProject.ext.versionName
}

View File

@ -15,19 +15,9 @@ def getVersionName = { ->
}
ext {
versionCode = properties.get('VERSION', "12").toInteger()
minSdk = properties.get('MIN_SDK', "14").toInteger()
targetSdk = properties.get('TARGET_SDK', "25").toInteger()
compileSdk = properties.get('COMPILE_SDK', "25").toInteger()
buildToolsVersion = properties.get('BUILD_TOOLS', "25.0.2")
versionName = properties.get('VERSION_NAME', getVersionName())
println '----------------- Project configuration -------------------'
println 'VERSION: ' + versionCode
println 'MIN_SDK: ' + minSdk
println 'TARGET_SDK: ' + targetSdk
println 'COMPILE_SDK: ' + compileSdk
println 'BUILD_TOOLS: ' + buildToolsVersion
println 'VERSION_NAME: ' + versionName
println 'RELEASE_STORE_FILE: '+ RELEASE_STORE_FILE
println 'RELEASE_KEY_ALIAS: '+ RELEASE_KEY_ALIAS
@ -37,14 +27,16 @@ ext {
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.0.1'
}
}
allprojects {
repositories {
jcenter()
google()
}
}

View File

@ -1,14 +1,14 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion = rootProject.ext.compileSdk
buildToolsVersion = rootProject.ext.buildToolsVersion
compileSdkVersion = 27
buildToolsVersion = "27.0.3"
defaultConfig {
minSdkVersion rootProject.ext.minSdk
targetSdkVersion rootProject.ext.targetSdk
minSdkVersion 14
targetSdkVersion 27
vectorDrawables.useSupportLibrary = true
versionCode = rootProject.ext.versionCode
versionCode = 12
versionName = rootProject.ext.versionName
}
@ -25,7 +25,7 @@ android {
}
dependencies {
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:support-v4:25.2.0'
compile 'com.android.support:support-vector-drawable:25.2.0'
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:support-v4:27.0.2'
compile 'com.android.support:support-vector-drawable:27.0.2'
}

View File

@ -1,6 +1,6 @@
#Thu Mar 09 09:36:32 CET 2017
#Wed Jan 17 10:58:32 UTC 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip