Skip to content

Commit

Permalink
Merge pull request orhanobut#166 from rubengees/master
Browse files Browse the repository at this point in the history
Update dependencies and tools
  • Loading branch information
orhanobut authored Sep 21, 2016
2 parents a2037ee + 0b45637 commit 23b42b5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android:
components:
- tools
- platform-tools
- build-tools-24.0.1
- build-tools-24.0.2
- android-24
- extra-android-m2repository
- sys-img-armeabi-v7a-android-18
Expand Down
2 changes: 1 addition & 1 deletion benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:appcompat-v7:24.2.1'

compile project(':hawk')
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ ext {
minSdkVersion = 10
targetSdkVersion = 24
compileSdkVersion = 24
buildToolsVersion = '24.0.1'
buildToolsVersion = '24.0.2'
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7
}

ext.deps = [
gson : 'com.google.code.gson:gson:2.4',
conceal : 'com.facebook.conceal:conceal:1.1.2@aar',
conceal : 'com.facebook.conceal:conceal:1.1.3@aar',

// Test dependencies
junit : 'junit:junit:4.12',
Expand Down

0 comments on commit 23b42b5

Please sign in to comment.