Skip to content

Commit

Permalink
- update libraries and buildtools
Browse files Browse the repository at this point in the history
  • Loading branch information
ncapdevi committed Oct 9, 2017
1 parent ff281e6 commit a6079a8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ android:
- tools

# The BuildTools version used by your project
- build-tools-25.0.2
- build-tools-25.0.3
- build-tools-26.0.2

# The SDK version used to compile your project
- android-25
- android-26

# Additional components
- extra-android-m2repository
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion '26.0.1'
buildToolsVersion '26.0.2'
lintOptions{
abortOnError false
}
Expand Down Expand Up @@ -30,7 +30,7 @@ dependencies {
// compile 'com.ncapdevi:frag-nav:2.2.1'
compile project(':frag-nav')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:26.0.2'
implementation 'com.android.support:design:26.0.2'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.roughike:bottom-bar:2.0.2'
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta4'
classpath 'com.android.tools.build:gradle:3.0.0-beta7'
}
}

Expand Down
6 changes: 3 additions & 3 deletions frag-nav/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ext {

android {
compileSdkVersion 26
buildToolsVersion '25.0.3'
buildToolsVersion '26.0.2'

lintOptions{
abortOnError false
Expand All @@ -59,8 +59,8 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:26.0.2'
compile 'com.android.support:support-annotations:26.0.2'
compile 'com.android.support:support-fragment:26.1.0'
compile 'com.android.support:support-annotations:26.1.0'
testCompile "junit:junit:$rootProject.ext.junitVersion"
testCompile "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
testCompile "org.powermock:powermock-module-junit4:$rootProject.ext.powerMockito"
Expand Down

0 comments on commit a6079a8

Please sign in to comment.