From 0c8fd3f78ea47b59ec9e2716d83c46ffc8fa770b Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 1 Jan 2018 21:26:26 +0100 Subject: [PATCH] Update gradle, build tools, deps --- .travis.yml | 13 +++---------- build.gradle | 9 +++++---- extern/GmsApi | 2 +- gradle/wrapper/gradle-wrapper.properties | 18 +----------------- play-services-base/build.gradle | 7 ++++--- play-services-cast/build.gradle | 7 ++++--- play-services-gcm/build.gradle | 5 +++-- play-services-iid/build.gradle | 7 ++++--- play-services-location/build.gradle | 7 ++++--- .../gms/location/NativeLocationClientImpl.java | 2 +- play-services-tasks/build.gradle | 5 +++-- play-services-wearable/build.gradle | 9 +++++---- play-services/build.gradle | 13 +++++++------ 13 files changed, 45 insertions(+), 59 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d79a24e..b5475ba4 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,9 @@ script: android: components: - tools + - platform-tools - build-tools-25.0.2 - android-25 - 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 5412a4de..791356fc 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/extern/GmsApi b/extern/GmsApi index c90a6851..0e994f38 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit c90a6851b2384a78b5a7a6bcd1b5e21c3d11c4ca +Subproject commit 0e994f38058df014ea709de7826890ccc334b647 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 654f05ca..6a4a18a5 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,22 +1,6 @@ -# -# Copyright 2013-2015 microG Project Team -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - #Sat Apr 22 15:09:21 CEST 2017 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-base/build.gradle b/play-services-base/build.gradle index 69288170..2e251383 100644 --- a/play-services-base/build.gradle +++ b/play-services-base/build.gradle @@ -36,11 +36,12 @@ 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-tasks') + api project(':play-services-basement') + api project(':play-services-tasks') } diff --git a/play-services-cast/build.gradle b/play-services-cast/build.gradle index 0ff2309a..85ea138a 100644 --- a/play-services-cast/build.gradle +++ b/play-services-cast/build.gradle @@ -36,11 +36,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-base') - compile project(':play-services-cast-api') + api project(':play-services-base') + api project(':play-services-cast-api') } diff --git a/play-services-gcm/build.gradle b/play-services-gcm/build.gradle index ca11d55f..fc2881e0 100644 --- a/play-services-gcm/build.gradle +++ b/play-services-gcm/build.gradle @@ -36,11 +36,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-iid') + api project(':play-services-iid') // compile project(':play-services-measurement') } \ No newline at end of file diff --git a/play-services-iid/build.gradle b/play-services-iid/build.gradle index 4aaf7e81..c8960415 100644 --- a/play-services-iid/build.gradle +++ b/play-services-iid/build.gradle @@ -36,11 +36,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-base') - compile project(':play-services-iid-api') + api project(':play-services-base') + api project(':play-services-iid-api') } diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle index d1ffc59a..a19126df 100644 --- a/play-services-location/build.gradle +++ b/play-services-location/build.gradle @@ -36,11 +36,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } dependencies { - compile project(':play-services-base') - compile project(':play-services-location-api') + api project(':play-services-base') + api project(':play-services-location-api') } \ No newline at end of file diff --git a/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java index b9d97a56..17a017d9 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java +++ b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java @@ -190,7 +190,7 @@ public class NativeLocationClientImpl { PendingIntent pendingIntent = intent.getExtras().getParcelable(EXTRA_PENDING_INTENT); try { intent.putExtra(FusedLocationProviderApi.KEY_LOCATION_CHANGED, - intent.getParcelableExtra(KEY_LOCATION_CHANGED)); + intent.getParcelableExtra(KEY_LOCATION_CHANGED)); pendingIntent.send(context, 0, intent); pendingCount.put(pendingIntent, pendingCount.get(pendingIntent) - 1); if (pendingCount.get(pendingIntent) == 0) { diff --git a/play-services-tasks/build.gradle b/play-services-tasks/build.gradle index 133f6c46..b71cf599 100644 --- a/play-services-tasks/build.gradle +++ b/play-services-tasks/build.gradle @@ -36,10 +36,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/build.gradle b/play-services-wearable/build.gradle index a65bd2b7..f0e5f8e8 100644 --- a/play-services-wearable/build.gradle +++ b/play-services-wearable/build.gradle @@ -42,7 +42,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } lintOptions { @@ -51,7 +52,7 @@ android { } dependencies { - compile project(':play-services-base') - compile project(':play-services-wearable-api') - compile 'com.squareup.wire:wire-runtime:1.6.1' + api project(':play-services-base') + api project(':play-services-wearable-api') + implementation 'com.squareup.wire:wire-runtime:1.6.1' } diff --git a/play-services/build.gradle b/play-services/build.gradle index 1ff4eba7..488c0632 100644 --- a/play-services/build.gradle +++ b/play-services/build.gradle @@ -36,7 +36,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } lintOptions { @@ -45,9 +46,9 @@ android { } dependencies { - compile project(':play-services-base') - compile project(':play-services-cast') - compile project(':play-services-gcm') - compile project(':play-services-location') - compile project(':play-services-wearable') + api project(':play-services-base') + api project(':play-services-cast') + api project(':play-services-gcm') + api project(':play-services-location') + api project(':play-services-wearable') }