From 0e994f38058df014ea709de7826890ccc334b647 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 1 Jan 2018 21:18:16 +0100 Subject: [PATCH] Update gradle, build tools --- .travis.yml | 18 ++++++------------ build.gradle | 9 +++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- play-services-api/build.gradle | 15 ++++++++------- play-services-basement/build.gradle | 7 ++++--- play-services-cast-api/build.gradle | 5 +++-- play-services-cast-framework-api/build.gradle | 5 +++-- play-services-iid-api/build.gradle | 5 +++-- play-services-location-api/build.gradle | 5 +++-- play-services-wearable-api/build.gradle | 5 +++-- 10 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d79a24e..db831514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,4 @@ language: android -git: - submodules: false -before_install: - - git submodule update --init --recursive script: - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - export TERM=dumb @@ -12,12 +8,10 @@ script: android: components: - tools - - build-tools-25.0.2 - - android-25 + - platform-tools + - build-tools-27.0.3 + - android-27 - extra-android-m2repository -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ +before_install: + - yes | sdkmanager "platforms;android-27" + diff --git a/build.gradle b/build.gradle index 829524c0..1d40c918 100644 --- a/build.gradle +++ b/build.gradle @@ -17,21 +17,22 @@ buildscript { repositories { jcenter() + google() } 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' } } allprojects { 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 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6e14d99..6a4a18a5 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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.4.1-all.zip diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle index 22155d2d..992b8ac5 100644 --- a/play-services-api/build.gradle +++ b/play-services-api/build.gradle @@ -39,15 +39,16 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-basement') - compile project(':play-services-cast-api') - compile project(':play-services-cast-framework-api') - compile project(':play-services-iid-api') - compile project(':play-services-location-api') - compile project(':play-services-wearable-api') + api project(':play-services-basement') + api project(':play-services-cast-api') + api project(':play-services-cast-framework-api') + api project(':play-services-iid-api') + api project(':play-services-location-api') + api project(':play-services-wearable-api') } diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index e3bdf102..e7c7d82a 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -44,11 +44,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile 'com.android.support:support-v4:25.3.1' - compile 'org.microg:safe-parcel:1.4.0' + api 'com.android.support:support-v4:25.3.1' + api 'org.microg:safe-parcel:1.4.0' } diff --git a/play-services-cast-api/build.gradle b/play-services-cast-api/build.gradle index dd3226e5..763e01b6 100644 --- a/play-services-cast-api/build.gradle +++ b/play-services-cast-api/build.gradle @@ -39,10 +39,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-basement') + api project(':play-services-basement') } diff --git a/play-services-cast-framework-api/build.gradle b/play-services-cast-framework-api/build.gradle index dd3226e5..763e01b6 100644 --- a/play-services-cast-framework-api/build.gradle +++ b/play-services-cast-framework-api/build.gradle @@ -39,10 +39,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-basement') + api project(':play-services-basement') } diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle index dd3226e5..763e01b6 100644 --- a/play-services-iid-api/build.gradle +++ b/play-services-iid-api/build.gradle @@ -39,10 +39,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-basement') + api project(':play-services-basement') } diff --git a/play-services-location-api/build.gradle b/play-services-location-api/build.gradle index dd3226e5..763e01b6 100644 --- a/play-services-location-api/build.gradle +++ b/play-services-location-api/build.gradle @@ -39,10 +39,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-basement') + api project(':play-services-basement') } diff --git a/play-services-wearable-api/build.gradle b/play-services-wearable-api/build.gradle index dd3226e5..763e01b6 100644 --- a/play-services-wearable-api/build.gradle +++ b/play-services-wearable-api/build.gradle @@ -39,10 +39,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-basement') + api project(':play-services-basement') }