Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies #205

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android:
- tools
- platform-tools
- tools
- build-tools-25.0.2
- build-tools-25.0.3
- android-25
- extra-android-m2repository
- extra-google-m2repository
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You should add this to your dependencies:
compile 'io.nlopez.smartlocation:library:3.3.1'
```

Google Play Services compatible version: 10.2.0
Google Play Services compatible version: 11.0.1

If you want the rxjava wrappers, these are now in a separate dependency. Just add this new dependency as well:

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}
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 Aug 29 12:50:39 CEST 2016
#Thu Jun 15 14:53:11 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ dependencies {
mavenCentral()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}
compile 'com.google.android.gms:play-services-location:10.2.0'
compile 'com.android.support:support-annotations:25.2.0'
compile 'com.google.android.gms:play-services-location:11.0.1'
compile 'com.android.support:support-annotations:25.3.1'
testCompile "junit:junit:$junitVersion"
testCompile "org.robolectric:robolectric:$robolectricVersion"
testCompile "org.robolectric:robolectric-shadows:$robolectricVersion"
Expand All @@ -28,7 +28,7 @@ dependencies {

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
buildToolsVersion '25.0.3'

buildTypes {
defaultConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,15 @@ private void notifyActivity(final DetectedActivity detectedActivity) {
private BroadcastReceiver activityReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (BROADCAST_INTENT_ACTION.equals(intent.getAction()) && intent.hasExtra(DETECTED_ACTIVITY_EXTRA_ID)) {
logger.d("sending new activity");
DetectedActivity detectedActivity = intent.getParcelableExtra(DETECTED_ACTIVITY_EXTRA_ID);
notifyActivity(detectedActivity);
try {
if (BROADCAST_INTENT_ACTION.equals(intent.getAction()) && intent.hasExtra(DETECTED_ACTIVITY_EXTRA_ID)) {
logger.d("sending new activity");
DetectedActivity detectedActivity = intent.getParcelableExtra(DETECTED_ACTIVITY_EXTRA_ID);
if (detectedActivity != null)
notifyActivity(detectedActivity);
}
} catch (Exception ignored) {
// Catch bad parcelable exception
}
}
};
Expand Down
4 changes: 2 additions & 2 deletions rxjava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}
compile project(':library')
compile 'io.reactivex.rxjava2:rxjava:2.0.6'
compile 'io.reactivex.rxjava2:rxjava:2.1.0'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
testCompile "junit:junit:$junitVersion"
testCompile "org.robolectric:robolectric:$robolectricVersion"
Expand All @@ -29,7 +29,7 @@ dependencies {

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
buildToolsVersion '25.0.3'

buildTypes {
defaultConfig {
Expand Down
7 changes: 4 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
buildToolsVersion '25.0.3'

defaultConfig {
applicationId "io.nlopez.smartlocation"
Expand All @@ -19,6 +19,7 @@ repositories {

dependencies {
compile project(':library')
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
}