Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
John Rodriguez committed Sep 12, 2017
1 parent 530fdf6 commit b339400
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ language: android
android:
components:
- tools
- build-tools-25.0.0
- platform-tools
- extra-android-m2repository
- extra-google-android-support
- android-25
licenses:
- 'android-sdk-license-.+'

jdk:
- oraclejdk8

before_script:
# Install SDK license so Android Gradle plugin can install deps.
- mkdir "$ANDROID_HOME/licenses" || true
- echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"

script:
- ./gradlew clean build check

Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
buildscript {
ext.versions = [
'minSdk': 14,
'compileSdk': 25,
'buildTools': '25.0.0',
'supportLibrary': '23.1.1'
'compileSdk': 26,
'buildTools': '26.0.1',
'supportLibrary': '26.0.2'
]

ext.deps = [
Expand All @@ -12,20 +12,20 @@ buildscript {
'appcompat': "com.android.support:appcompat-v7:${versions.supportLibrary}",
'design': "com.android.support:design:${versions.supportLibrary}",
'test': [
'espresso': 'com.android.support.test.espresso:espresso-core:2.2.1',
'runner': 'com.android.support.test:runner:0.4',
'rules': 'com.android.support.test:rules:0.4',
'espresso': 'com.android.support.test.espresso:espresso-core:3.0.1',
'runner': 'com.android.support.test:runner:1.0.1',
'rules': 'com.android.support.test:rules:1.0.1',
]
],
'junit': 'junit:junit:4.12',
'assertj': 'org.assertj:assertj-core:1.7.1',
'mockito': 'org.mockito:mockito-core:2.8.47',
'robolectric': 'org.robolectric:robolectric:3.4-rc5',
'assertj': 'org.assertj:assertj-core:3.8.0',
'mockito': 'org.mockito:mockito-core:2.10.0',
'robolectric': 'org.robolectric:robolectric:3.4.2',
'antTasks': 'org.apache.maven:maven-ant-tasks:2.1.3',
]

dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha7'
classpath 'com.android.tools.build:gradle:3.0.0-beta5'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
}

Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Tue Sep 12 02:43:35 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 comments on commit b339400

Please sign in to comment.