Skip to content

Commit

Permalink
Updated libraries (#159)
Browse files Browse the repository at this point in the history
* Updated libraries

* Raised version to 4.0.2

* changed gradle wrapper to version 4.4

* Skipped lint issue

* Updated activity version
  • Loading branch information
ferranpons authored Apr 26, 2018
1 parent 714624b commit 48581c3
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 23 deletions.
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
/*/build/
build/
/*/bin/
/*/gen/
/*/proguard/
/*/out/
/*/.svn/
/*/.settings/
/*/*.iml
*.apk
*.ap_
*.class
*.dex
local.properties
project.properties
Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ Component library for Android that uses Google Maps and returns a latitude, long
### Prerequisites

minSdkVersion >= 15<br/>
Google Play Services = 11.8.0<br/>
Support Library = 27.0.2
Google Play Services = 12.0.1<br/>
Support Library = 27.1.1

### Download

Expand All @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<string name="google_maps_key"></string>
<string name="launch_map_picker" translatable="false">LAUNCH MAP LOCATION PICKER ACTIVITY</string>
<string name="launch_map_picker_with_pois" translatable="false">LAUNCH MAP WITH POIS</string>
<string name="leku_lib_version">version 4.0.0</string>
<string name="leku_lib_version">version 4.0.2</string>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions leku/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -57,7 +58,7 @@ private List<Address> getAddressListFromPrediction(List<AutocompletePrediction>
} 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;
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MAJOR=4
MINOR=0
PATCH=1
PATCH=2

0 comments on commit 48581c3

Please sign in to comment.