mirror of
https://github.com/TeamVanced/VancedMicroG
synced 2024-12-02 17:02:54 +01:00
Update gradle, build tools
This commit is contained in:
parent
c90a6851b2
commit
0e994f3805
18
.travis.yml
18
.travis.yml
@ -1,8 +1,4 @@
|
|||||||
language: android
|
language: android
|
||||||
git:
|
|
||||||
submodules: false
|
|
||||||
before_install:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
script:
|
script:
|
||||||
- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
|
- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
|
||||||
- export TERM=dumb
|
- export TERM=dumb
|
||||||
@ -12,12 +8,10 @@ script:
|
|||||||
android:
|
android:
|
||||||
components:
|
components:
|
||||||
- tools
|
- tools
|
||||||
- build-tools-25.0.2
|
- platform-tools
|
||||||
- android-25
|
- build-tools-27.0.3
|
||||||
|
- android-27
|
||||||
- extra-android-m2repository
|
- extra-android-m2repository
|
||||||
before_cache:
|
before_install:
|
||||||
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
- yes | sdkmanager "platforms;android-27"
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- $HOME/.gradle/caches/
|
|
||||||
- $HOME/.gradle/wrapper/
|
|
||||||
|
@ -17,21 +17,22 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.3.1'
|
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
|
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
ext.androidBuildVersionTools = "25.0.2"
|
ext.androidBuildVersionTools = "27.0.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
def androidCompileSdk() { return 25 }
|
def androidCompileSdk() { return 27 }
|
||||||
|
|
||||||
def androidTargetSdk() { return 24 }
|
def androidTargetSdk() { return 27 }
|
||||||
|
|
||||||
def androidMinSdk() { return 9 }
|
def androidMinSdk() { return 9 }
|
||||||
|
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -3,4 +3,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-3.3-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
|
||||||
|
@ -39,15 +39,16 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
compile project(':play-services-cast-api')
|
api project(':play-services-cast-api')
|
||||||
compile project(':play-services-cast-framework-api')
|
api project(':play-services-cast-framework-api')
|
||||||
compile project(':play-services-iid-api')
|
api project(':play-services-iid-api')
|
||||||
compile project(':play-services-location-api')
|
api project(':play-services-location-api')
|
||||||
compile project(':play-services-wearable-api')
|
api project(':play-services-wearable-api')
|
||||||
}
|
}
|
||||||
|
@ -44,11 +44,12 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'com.android.support:support-v4:25.3.1'
|
api 'com.android.support:support-v4:25.3.1'
|
||||||
compile 'org.microg:safe-parcel:1.4.0'
|
api 'org.microg:safe-parcel:1.4.0'
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user