Skip to content

Commit

Permalink
Merge pull request JakeWharton#80 from JakeWharton/jw/update-things
Browse files Browse the repository at this point in the history
Update build and dependencies to latest.
  • Loading branch information
JakeWharton committed Oct 17, 2015
2 parents 53c4dbc + b373bca commit c09b2dd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ jdk:

android:
components:
- build-tools-22.0.1
- android-22
- extra-android-support
- extra-google-google_play_services
- build-tools-23.0.1
- android-23
- extra-android-m2repository
- extra-google-m2repository

Expand Down
13 changes: 7 additions & 6 deletions telecine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ def versionBuild = 0 // bump for dogfood builds, public betas, etc.

buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

Expand All @@ -22,8 +22,8 @@ apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'

android {
compileSdkVersion 22
buildToolsVersion '22.0.1'
compileSdkVersion 23
buildToolsVersion '23.0.1'

defaultConfig {
applicationId 'com.jakewharton.telecine'
Expand All @@ -47,6 +47,7 @@ android {
textReport true
textOutput 'stdout'
warning 'MissingTranslation'
warning 'ResourceType' // TODO remove when updated to Butter Knife 8.0.
}

dexOptions {
Expand All @@ -71,10 +72,10 @@ android {
}

dependencies {
compile 'com.android.support:support-annotations:22.2.1'
compile 'com.android.support:support-annotations:23.1.0'
compile 'com.google.android.gms:play-services-analytics:7.5.0'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.jakewharton.timber:timber:3.1.0'
compile 'com.jakewharton.timber:timber:4.0.1'
compile 'com.bugsnag:bugsnag-android:3.2.5'
compile 'com.squareup.dagger:dagger:1.2.2'
apt 'com.squareup.dagger:dagger-compiler:1.2.2'
Expand Down

0 comments on commit c09b2dd

Please sign in to comment.