Update build system and deps

This commit is contained in:
Marvin W 2019-10-15 14:54:05 +02:00
parent d2735650af
commit ee8e5427c4
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
7 changed files with 8 additions and 9 deletions

View File

@ -10,7 +10,7 @@ android:
components:
- tools
- platform-tools
- build-tools-28.0.3
- build-tools-29.0.2
- android-27
- android-28
- extra-android-m2repository

View File

@ -21,7 +21,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
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"
}
@ -29,7 +29,7 @@ buildscript {
allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "28.0.3"
ext.androidBuildVersionTools = "29.0.2"
ext.supportLibraryVersion = "28.0.0"
ext.isReleaseVersion = false
ext.slf4jVersion = "1.7.25"
@ -37,7 +37,7 @@ allprojects {
def androidCompileSdk() { return 28 }
def androidTargetSdk() { return 28 }
def androidTargetSdk() { return 29 }
def androidMinSdk() { return 14 }

2
extern/GmsApi vendored

@ -1 +1 @@
Subproject commit 51509859ae51097ad5789ba4ca2e9ffb9658f80e
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6

2
extern/GmsLib vendored

@ -1 +1 @@
Subproject commit 39d20ec1f28bcc4b134d76f43296bad587362c69
Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792

View File

@ -1 +0,0 @@
android.useDeprecatedNdk=true

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-5.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

View File

@ -3,7 +3,7 @@
-optimizations !code/allocation/variable
# We're referencing stuff that is unknown to the system
-libraryjar ../unifiednlp-compat/build/classes/java/main
#-libraryjar ../unifiednlp-compat/build/classes/java/main
-dontwarn java.awt.**
-dontwarn javax.annotation.**