diff --git a/.travis.yml b/.travis.yml index 708a78e..7ba81bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,20 @@ branches: language: android sudo: false +jdk: + - oraclejdk8 android: components: - - build-tools-23.0.1 - - android-22 - - doc-23 - - extra-android-support + - tools # to get the new `repository-11.xml` + - platform-tools + - build-tools-25.0.2 + - android-25 + - doc-25 + - extra-google-m2repository - extra-android-m2repository + licenses: + - 'android-sdk-license-.+' before_install: - pip install --user codecov diff --git a/ParseLiveQuery/build.gradle b/ParseLiveQuery/build.gradle index f125681..1c19d40 100644 --- a/ParseLiveQuery/build.gradle +++ b/ParseLiveQuery/build.gradle @@ -8,11 +8,11 @@ version = '1.0.1-SNAPSHOT' buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1' } } @@ -45,8 +45,9 @@ dependencies { compile 'com.squareup.okhttp3:okhttp:3.6.0' compile 'com.parse.bolts:bolts-tasks:1.4.0' - testCompile 'org.robolectric:robolectric:3.0' - testCompile 'org.skyscreamer:jsonassert:1.2.3' + testCompile 'org.robolectric:robolectric:3.3.1' + testCompile 'org.skyscreamer:jsonassert:1.5.0' + testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' } diff --git a/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java b/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java index fc60c45..e0a35a6 100644 --- a/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java +++ b/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java @@ -9,7 +9,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.net.URI; @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(RobolectricGradleTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(constants = BuildConfig.class, sdk = 21) public class TestParseLiveQueryClient { diff --git a/build.gradle b/build.gradle index 517ca2c..df5cfc4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,23 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.3.0' } } allprojects { repositories { - mavenCentral() + jcenter() } } ext { - compileSdkVersion = 22 - buildToolsVersion = "23.0.1" + compileSdkVersion = 25 + buildToolsVersion = "25.0.2" minSdkVersion = 9 - targetSdkVersion = 23 + targetSdkVersion = 25 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 15e861b..b3d5b71 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 06 11:00:14 PST 2014 +#Thu Mar 23 00:03:48 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip