Skip to content

Bump to Android API 25 #20

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

Merged
merged 1 commit into from
Mar 27, 2017
Merged
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
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions ParseLiveQuery/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ version = '1.0.1-SNAPSHOT'

buildscript {
repositories {
mavenCentral()
jcenter()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which library wasn't available on mavenCentral()?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jcenter is a superset of maven central.

Android Studio by default has moved to jcenter

https://blog.bintray.com/2015/02/09/android-studio-migration-from-maven-central-to-jcenter/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes ok. I personally already experienced connections problems with jcenter over mavenCentral.
But I'm all fine by putting back jcenter.
Thanks

}

dependencies {
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
}
}

Expand Down Expand Up @@ -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'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
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 @@
#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