Skip to content

Commit

Permalink
Update to 0.11.0 with sdk 25
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanepechard committed Nov 7, 2016
1 parent 7d66d52 commit b067d8f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cache: false
sudo: false
env:
global:
- ANDROID_API_LEVEL=24
- ANDROID_BUILD_TOOLS_VERSION=24.0.3
- ANDROID_API_LEVEL=25
- ANDROID_BUILD_TOOLS_VERSION=25.0.0
- ANDROID_ABI=armeabi-v7a
- ADB_INSTALL_TIMEOUT=10 # minutes (2 minutes by default)

Expand Down
12 changes: 7 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
apply plugin: 'com.android.application'

ext.supportLibVersion = '24.2.1'
ext.supportLibVersion = '25.0.0'


android {
compileSdkVersion 24
compileSdkVersion 25
buildToolsVersion "24.0.3"
dataBinding.enabled = true

defaultConfig {
applicationId "fr.s13d.photobackup"
minSdkVersion 16
targetSdkVersion 24
versionCode 32
versionName "0.10.5"
targetSdkVersion 25
versionCode 33
versionName "0.11.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand All @@ -30,6 +30,8 @@ android {
lintOptions {
abortOnError false
}

// to force Gradle version conflicts resolving
configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:2.0.1'
}
Expand Down

0 comments on commit b067d8f

Please sign in to comment.