From b067d8ff280be81d31e207107dc46ef5623aec83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20P=C3=A9chard?= Date: Mon, 7 Nov 2016 21:09:12 +0100 Subject: [PATCH] Update to 0.11.0 with sdk 25 --- .travis.yml | 4 ++-- app/build.gradle | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e69fe0..2966c90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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) diff --git a/app/build.gradle b/app/build.gradle index 6a8ff3e..0db1754 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" } @@ -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' }