From 48581c3b5c5f927558757c08f9a79ec0ddbcfd2e Mon Sep 17 00:00:00 2001 From: Ferran Pons Date: Thu, 26 Apr 2018 14:37:29 +0200 Subject: [PATCH] Updated libraries (#159) * Updated libraries * Raised version to 4.0.2 * changed gradle wrapper to version 4.4 * Skipped lint issue * Updated activity version --- .gitignore | 8 +------- README.md | 8 ++++---- app/build.gradle | 2 +- app/src/main/res/values/strings.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- leku/build.gradle | 10 +++++----- .../leku/geocoder/places/GooglePlacesDataSource.java | 3 ++- version.properties | 2 +- 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 65b536b6..58269110 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/*/build/ build/ /*/bin/ /*/gen/ @@ -6,10 +5,8 @@ build/ /*/out/ /*/.svn/ /*/.settings/ -/*/*.iml *.apk *.ap_ -*.class *.dex local.properties project.properties @@ -19,15 +16,12 @@ app/src/debug/*.xml .idea/.name .idea/*.xml .idea/dataSources.ids -.idea/libraries/ .idea/scopes/ -.idea/copyright/ -.idea/dictionaries/ .idea/inspectionProfiles/ +.idea/*/ .metadata/ *.iml -*/.DS_Store .DS_Store Thumbs.db diff --git a/README.md b/README.md index 91c52523..0c4cb2f1 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,8 @@ Component library for Android that uses Google Maps and returns a latitude, long ### Prerequisites minSdkVersion >= 15
-Google Play Services = 11.8.0
-Support Library = 27.0.2 +Google Play Services = 12.0.1
+Support Library = 27.1.1 ### Download @@ -82,14 +82,14 @@ Include the dependency in your app `build.gradle`: ```groovy dependencies { - implementation 'com.schibstedspain.android:leku:4.0.1' + implementation 'com.schibstedspain.android:leku:4.0.2' } ``` Alternatively, if you are using a different version of Google Play Services than `11.8.0` use this instead: ```groovy -implementation ('com.schibstedspain.android:leku:4.0.1') { +implementation ('com.schibstedspain.android:leku:4.0.2') { exclude group: 'com.google.android.gms' exclude group: 'com.android.support' } diff --git a/app/build.gradle b/app/build.gradle index d345d23d..2c3209f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,6 +29,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:appcompat-v7:27.1.1' implementation project(':leku') } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3dc0484f..a36bdf88 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,5 +3,5 @@ LAUNCH MAP LOCATION PICKER ACTIVITY LAUNCH MAP WITH POIS - version 4.0.0 + version 4.0.2 diff --git a/build.gradle b/build.gradle index 9c846adf..d4b4c3ea 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.6.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ab9aa5ac..a70dec1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 06 14:07:04 CET 2017 +#Wed Apr 25 16:21:21 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/leku/build.gradle b/leku/build.gradle index 2ef30b9f..da685e9a 100644 --- a/leku/build.gradle +++ b/leku/build.gradle @@ -48,27 +48,27 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - def supportVersion = '27.1.0' + def supportVersion = '27.1.1' implementation "com.android.support:appcompat-v7:$supportVersion" implementation "com.android.support:design:$supportVersion" - def playServicesVersion = '11.8.0' + def playServicesVersion = '12.0.1' implementation "com.google.android.gms:play-services-maps:$playServicesVersion" implementation "com.google.android.gms:play-services-location:$playServicesVersion" implementation "com.google.android.gms:play-services-places:$playServicesVersion" implementation 'pl.charmas.android:android-reactive-location2:2.0@aar' - implementation 'io.reactivex.rxjava2:rxjava:2.1.11' + implementation 'io.reactivex.rxjava2:rxjava:2.1.12' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' - implementation 'nl.littlerobots.rxlint:rxlint:1.6' + implementation 'nl.littlerobots.rxlint:rxlint:1.6.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test:rules:1.0.1' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1' - androidTestImplementation 'org.mockito:mockito-core:2.12.0' + androidTestImplementation 'org.mockito:mockito-core:2.17.0' } publish { diff --git a/leku/src/main/java/com/schibstedspain/leku/geocoder/places/GooglePlacesDataSource.java b/leku/src/main/java/com/schibstedspain/leku/geocoder/places/GooglePlacesDataSource.java index af7ad960..de09ed19 100644 --- a/leku/src/main/java/com/schibstedspain/leku/geocoder/places/GooglePlacesDataSource.java +++ b/leku/src/main/java/com/schibstedspain/leku/geocoder/places/GooglePlacesDataSource.java @@ -1,5 +1,6 @@ package com.schibstedspain.leku.geocoder.places; +import android.annotation.SuppressLint; import android.location.Address; import android.support.annotation.NonNull; import com.google.android.gms.common.data.DataBufferUtils; @@ -57,7 +58,7 @@ private List
getAddressListFromPrediction(List } catch (ExecutionException | InterruptedException | TimeoutException ignored) { } PlaceBufferResponse placeBufferResponse = placeBufferResponseTask.getResult(); - Place place = placeBufferResponse.get(0); + @SuppressLint("RestrictedApi") Place place = placeBufferResponse.get(0); addressList.add(mapPlaceToAddress(place)); } return addressList; diff --git a/version.properties b/version.properties index 2273ef70..9f68a6dd 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,3 @@ MAJOR=4 MINOR=0 -PATCH=1 \ No newline at end of file +PATCH=2 \ No newline at end of file