Skip to content

Commit

Permalink
Merge pull request JakeWharton#134 from JakeWharton/jw/all-the-things
Browse files Browse the repository at this point in the history
Update all the things.
  • Loading branch information
JakeWharton authored Nov 23, 2016
2 parents dc58603 + 7cd1cd3 commit 07dcb24
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android:
components:
- tools
- platform-tools
- build-tools-24.0.2
- android-24
- build-tools-25.0.1
- android-25
- extra-android-m2repository
- extra-google-m2repository

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
22 changes: 11 additions & 11 deletions telecine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def versionBuild = 0 // bump for dogfood builds, public betas, etc.

buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

Expand All @@ -20,8 +20,8 @@ def getAnalyticsKey() {
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion '24.0.2'
compileSdkVersion 25
buildToolsVersion '25.0.1'

defaultConfig {
applicationId 'com.jakewharton.telecine'
Expand Down Expand Up @@ -75,15 +75,15 @@ android {
}

dependencies {
compile 'com.android.support:support-annotations:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.google.android.gms:play-services-analytics:9.4.0'
compile 'com.android.support:support-annotations:25.0.1'
compile 'com.android.support:design:25.0.1'
compile 'com.google.android.gms:play-services-analytics:10.0.0'
compile 'com.jakewharton:butterknife:8.4.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
compile 'com.jakewharton.timber:timber:4.1.2'
compile 'com.bugsnag:bugsnag-android:3.4.0'
compile 'com.google.dagger:dagger:2.7'
annotationProcessor 'com.google.dagger:dagger-compiler:2.7'
compile 'com.jakewharton.timber:timber:4.3.1'
compile 'com.bugsnag:bugsnag-android:3.7.0'
compile 'com.google.dagger:dagger:2.8'
annotationProcessor 'com.google.dagger:dagger-compiler:2.8'
testCompile 'junit:junit:4.12'
testCompile 'com.google.truth:truth:0.28'
testCompile 'com.google.truth:truth:0.30'
}

0 comments on commit 07dcb24

Please sign in to comment.