Skip to content

Commit ea2892f

Browse files
authored
Bump to Android API 25 (#20)
Bump Gradle versions Bump Roboelectric version Bump Travis Fix Travis YML Move to jcenter
1 parent 3368d33 commit ea2892f

File tree

5 files changed

+25
-18
lines changed

5 files changed

+25
-18
lines changed

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@ branches:
44

55
language: android
66
sudo: false
7+
jdk:
8+
- oraclejdk8
79

810
android:
911
components:
10-
- build-tools-23.0.1
11-
- android-22
12-
- doc-23
13-
- extra-android-support
12+
- tools # to get the new `repository-11.xml`
13+
- platform-tools
14+
- build-tools-25.0.2
15+
- android-25
16+
- doc-25
17+
- extra-google-m2repository
1418
- extra-android-m2repository
19+
licenses:
20+
- 'android-sdk-license-.+'
1521

1622
before_install:
1723
- pip install --user codecov

ParseLiveQuery/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ version = '1.0.1-SNAPSHOT'
88

99
buildscript {
1010
repositories {
11-
mavenCentral()
11+
jcenter()
1212
}
1313

1414
dependencies {
15-
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x'
15+
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
1616
}
1717
}
1818

@@ -45,8 +45,9 @@ dependencies {
4545
compile 'com.squareup.okhttp3:okhttp:3.6.0'
4646
compile 'com.parse.bolts:bolts-tasks:1.4.0'
4747

48-
testCompile 'org.robolectric:robolectric:3.0'
49-
testCompile 'org.skyscreamer:jsonassert:1.2.3'
48+
testCompile 'org.robolectric:robolectric:3.3.1'
49+
testCompile 'org.skyscreamer:jsonassert:1.5.0'
50+
testCompile 'junit:junit:4.12'
5051
testCompile 'org.mockito:mockito-core:1.10.19'
5152
}
5253

ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.mockito.Mockito;
1111
import org.mockito.invocation.InvocationOnMock;
1212
import org.mockito.stubbing.Answer;
13-
import org.robolectric.RobolectricGradleTestRunner;
13+
import org.robolectric.RobolectricTestRunner;
1414
import org.robolectric.annotation.Config;
1515

1616
import java.net.URI;
@@ -36,7 +36,7 @@
3636
import static org.mockito.Mockito.verify;
3737
import static org.mockito.Mockito.when;
3838

39-
@RunWith(RobolectricGradleTestRunner.class)
39+
@RunWith(RobolectricTestRunner.class)
4040
@Config(constants = BuildConfig.class, sdk = 21)
4141
public class TestParseLiveQueryClient {
4242

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
repositories {
4-
mavenCentral()
4+
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.1.0'
7+
classpath 'com.android.tools.build:gradle:2.3.0'
88
}
99
}
1010

1111
allprojects {
1212
repositories {
13-
mavenCentral()
13+
jcenter()
1414
}
1515
}
1616

1717
ext {
18-
compileSdkVersion = 22
19-
buildToolsVersion = "23.0.1"
18+
compileSdkVersion = 25
19+
buildToolsVersion = "25.0.2"
2020

2121
minSdkVersion = 9
22-
targetSdkVersion = 23
22+
targetSdkVersion = 25
2323
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 06 11:00:14 PST 2014
1+
#Thu Mar 23 00:03:48 PDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)