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

update libraries and implementations #263

Open
wants to merge 1 commit 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
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ buildscript {
mavenCentral()
maven { url "https://maven.google.com" }
jcenter()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-rc2'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}
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 @@
#Sat Oct 14 10:52:55 BST 2017
#Sat Dec 08 18:53:50 CLST 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.6-all.zip
21 changes: 11 additions & 10 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,23 @@ dependencies {
maven { url "https://maven.google.com" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}
compile 'com.google.android.gms:play-services-location:11.4.2'
compile 'com.android.support:support-annotations:26.1.0'
testCompile "junit:junit:$junitVersion"
testCompile "org.robolectric:robolectric:$robolectricVersion"
testCompile "org.robolectric:robolectric-shadows:$robolectricVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
implementation 'com.google.android.gms:play-services-location:16.0.0'

implementation 'com.android.support:support-annotations:28.0.0'
testImplementation "junit:junit:$junitVersion"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation "org.robolectric:robolectric-shadows:$robolectricVersion"
testImplementation "org.mockito:mockito-core:$mockitoVersion"
}

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '28.0.3'

buildTypes {
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
versionCode 20006
versionName version
}
Expand All @@ -61,7 +62,7 @@ def isReleaseBuild() {
return version.contains("SNAPSHOT") == false
}

def getProperty(project, property) {
static def getProperty(project, property) {
return project.hasProperty(property) ? project.property(property) : ""
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ public void test_activity_recognition_stop() {
private SmartLocation.ActivityRecognitionControl createActivityRecognitionControl() {
Context context = RuntimeEnvironment.application.getApplicationContext();
SmartLocation smartLocation = new SmartLocation.Builder(context).preInitialize(false).build();
SmartLocation.ActivityRecognitionControl activityRecognitionControl = smartLocation.activity(mockProvider);
return activityRecognitionControl;
return smartLocation.activity(mockProvider);
}

}
24 changes: 12 additions & 12 deletions rxjava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ dependencies {
maven { url "https://maven.google.com" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}
compile project(':library')
compile 'io.reactivex.rxjava2:rxjava:2.1.5'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
testCompile "junit:junit:$junitVersion"
testCompile "org.robolectric:robolectric:$robolectricVersion"
testCompile "org.robolectric:robolectric-shadows:$robolectricVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
implementation project(':library')
implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
testImplementation "junit:junit:$junitVersion"
testImplementation "org.robolectric:robolectric:$robolectricVersion"
testImplementation "org.robolectric:robolectric-shadows:$robolectricVersion"
testImplementation "org.mockito:mockito-core:$mockitoVersion"
}

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '28.0.3'

buildTypes {
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
versionCode 20006
targetSdkVersion 28
versionCode 20007
versionName version
}
}
Expand All @@ -62,7 +62,7 @@ def isReleaseBuild() {
return version.contains("SNAPSHOT") == false
}

def getProperty(project, property) {
static def getProperty(project, property) {
return project.hasProperty(property) ? project.property(property) : ""
}

Expand Down
14 changes: 7 additions & 7 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "io.nlopez.smartlocation"
minSdkVersion 14
targetSdkVersion 26
versionCode 100
targetSdkVersion 28
versionCode 101
versionName "1.0.0"
}
}
Expand All @@ -19,7 +19,7 @@ repositories {
}

dependencies {
compile project(':library')
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
implementation project(':library')
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
}