Update build tools

This commit is contained in:
Marvin W 2019-10-15 02:11:24 +02:00
parent 4c4277b75e
commit 810a5ccab7
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
4 changed files with 13 additions and 6 deletions

View File

@ -21,20 +21,20 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "28.0.3"
ext.androidBuildVersionTools = "29.0.2"
}
def androidCompileSdk() { return 28 }
def androidCompileSdk() { return 29 }
def androidTargetSdk() { return 28 }
def androidTargetSdk() { return 29 }
def androidMinSdk() { return 14 }

View File

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

View File

@ -36,7 +36,11 @@ android {
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
aidlPackageWhiteList "com/google/android/gms/common/api/Status.aidl"
aidlPackageWhiteList "com/google/android/gms/common/data/DataHolder.aidl"
aidlPackageWhiteList "com/google/android/gms/common/images/WebImage.aidl"
aidlPackageWhiteList "com/google/android/gms/common/internal/ICancelToken.aidl"
aidlPackageWhiteList "com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl"
aidlPackageWhiteList "com/google/android/gms/dynamic/IObjectWrapper.aidl"
defaultConfig {

View File

@ -32,6 +32,9 @@ android {
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
aidlPackageWhiteList "com/google/android/gms/cast/ApplicationMetadata.aidl"
aidlPackageWhiteList "com/google/android/gms/cast/LaunchOptions.aidl"
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()