mirror of
https://github.com/TeamVanced/VancedMicroG
synced 2025-02-09 01:06:48 +01:00
Update build system and deps
This commit is contained in:
parent
d2735650af
commit
ee8e5427c4
@ -10,7 +10,7 @@ android:
|
|||||||
components:
|
components:
|
||||||
- tools
|
- tools
|
||||||
- platform-tools
|
- platform-tools
|
||||||
- build-tools-28.0.3
|
- build-tools-29.0.2
|
||||||
- android-27
|
- android-27
|
||||||
- android-28
|
- android-28
|
||||||
- extra-android-m2repository
|
- extra-android-m2repository
|
||||||
|
@ -21,7 +21,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
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 'com.github.dcendents:android-maven-gradle-plugin:2.0'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
}
|
}
|
||||||
@ -29,7 +29,7 @@ buildscript {
|
|||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
ext.androidBuildVersionTools = "28.0.3"
|
ext.androidBuildVersionTools = "29.0.2"
|
||||||
ext.supportLibraryVersion = "28.0.0"
|
ext.supportLibraryVersion = "28.0.0"
|
||||||
ext.isReleaseVersion = false
|
ext.isReleaseVersion = false
|
||||||
ext.slf4jVersion = "1.7.25"
|
ext.slf4jVersion = "1.7.25"
|
||||||
@ -37,7 +37,7 @@ allprojects {
|
|||||||
|
|
||||||
def androidCompileSdk() { return 28 }
|
def androidCompileSdk() { return 28 }
|
||||||
|
|
||||||
def androidTargetSdk() { return 28 }
|
def androidTargetSdk() { return 29 }
|
||||||
|
|
||||||
def androidMinSdk() { return 14 }
|
def androidMinSdk() { return 14 }
|
||||||
|
|
||||||
|
2
extern/GmsApi
vendored
2
extern/GmsApi
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 51509859ae51097ad5789ba4ca2e9ffb9658f80e
|
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6
|
2
extern/GmsLib
vendored
2
extern/GmsLib
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 39d20ec1f28bcc4b134d76f43296bad587362c69
|
Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792
|
@ -1 +0,0 @@
|
|||||||
android.useDeprecatedNdk=true
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
-optimizations !code/allocation/variable
|
-optimizations !code/allocation/variable
|
||||||
|
|
||||||
# We're referencing stuff that is unknown to the system
|
# 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 java.awt.**
|
||||||
-dontwarn javax.annotation.**
|
-dontwarn javax.annotation.**
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user