diff --git a/.travis.yml b/.travis.yml index 93bc47e1..b7843646 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,11 @@ android: - tools # The BuildTools version used by your project - - build-tools-25.0.2 + - build-tools-26.0.1 # The SDK version used to compile your project - android-22 - - android-25 + - android-26 # Additional components - extra-google-google_play_services diff --git a/build.gradle b/build.gradle index 346ca5e3..3b3dd0db 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ buildscript { allprojects { repositories { jcenter() + google() } tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') @@ -24,14 +25,21 @@ ext { VERSION_NAME = "0.8.1-SNAPSHOT" VERSION_CODE = 6 MIN_SDK_VERSION = 14 - TARGET_SDK_VERSION = 25 - COMPILE_SDK_VERSION = 25 - BUILD_TOOLS_VERSION = '25.0.2' + // If you change the SDK version don't forgot to update .travis.yml + TARGET_SDK_VERSION = 26 + COMPILE_SDK_VERSION = 26 + // If you change the build tools version don't forgot to update .travis.yml + BUILD_TOOLS_VERSION = '26.0.1' - supportLibraryVersion = '25.2.0' + supportLibraryVersion = '26.0.0' + // compositeAndroidVersion should be always the same version as the supportLib version + // Since composite is not up to date we can't use the latest one + compositeAndroidVersion = supportLibraryVersion bintrayVersion = '0.5.0' junitVersion = '4.12' - mockitoVersion = '1.10.19' - assertjVersion = '2.5.0' + mockitoVersion = '2.10.0' + assertjVersion = '2.8.0' + supportTestVersion = '1.0.1' + espressoVersion = '3.0.1' } diff --git a/plugin-test/build.gradle b/plugin-test/build.gradle index d51513e9..c79a856d 100644 --- a/plugin-test/build.gradle +++ b/plugin-test/build.gradle @@ -10,9 +10,7 @@ android { targetSdkVersion TARGET_SDK_VERSION versionCode 1 versionName "1.0" - testInstrumentationRunner "net.grandcentrix.thirtyinch.plugin_test.TestRunner" - } buildTypes { release { @@ -31,8 +29,8 @@ dependencies { compile "com.pascalwelsch.compositeandroid:activity:$supportLibraryVersion" compile "com.pascalwelsch.compositeandroid:fragment:$supportLibraryVersion" - androidTestCompile "com.android.support:appcompat-v7:$supportLibraryVersion" - androidTestCompile 'com.android.support.test:runner:0.5'; - androidTestCompile 'com.android.support.test:rules:0.5'; - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'; + androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion" + androidTestCompile "com.android.support.test:runner:$supportTestVersion"; + androidTestCompile "com.android.support.test:rules:$supportTestVersion"; + androidTestCompile "com.android.support.test.espresso:espresso-core:$espressoVersion"; } diff --git a/plugin/build.gradle b/plugin/build.gradle index 1feaa563..7b6efc88 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -37,8 +37,8 @@ android { dependencies { compile project(':thirtyinch') - provided "com.pascalwelsch.compositeandroid:activity:$supportLibraryVersion" - provided "com.pascalwelsch.compositeandroid:fragment:$supportLibraryVersion" + provided "com.pascalwelsch.compositeandroid:activity:$compositeAndroidVersion" + provided "com.pascalwelsch.compositeandroid:fragment:$compositeAndroidVersion" } publish { diff --git a/rx/build.gradle b/rx/build.gradle index 21b80353..750078e6 100644 --- a/rx/build.gradle +++ b/rx/build.gradle @@ -37,8 +37,8 @@ android { dependencies { compile project(':thirtyinch') - compile 'io.reactivex:rxjava:1.2.3' - compile 'com.artemzin.rxjava:proguard-rules:1.2.3.0' + compile 'io.reactivex:rxjava:1.3.2' + compile 'com.artemzin.rxjava:proguard-rules:1.2.7.0' provided "com.android.support:support-annotations:$supportLibraryVersion" testCompile "junit:junit:$junitVersion" diff --git a/rx2/build.gradle b/rx2/build.gradle index a10e70e8..182791cd 100644 --- a/rx2/build.gradle +++ b/rx2/build.gradle @@ -37,7 +37,7 @@ android { dependencies { compile project(':thirtyinch') - compile 'io.reactivex.rxjava2:rxjava:2.0.3' + compile 'io.reactivex.rxjava2:rxjava:2.1.4' provided "com.android.support:support-annotations:$supportLibraryVersion" testCompile "junit:junit:$junitVersion" diff --git a/thirtyinch/build.gradle b/thirtyinch/build.gradle index 290cae18..c7f4316a 100644 --- a/thirtyinch/build.gradle +++ b/thirtyinch/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile "org.mockito:mockito-core:$mockitoVersion" testCompile "org.assertj:assertj-core:$assertjVersion" - androidTestCompile 'com.android.support.test:runner:0.5' + androidTestCompile "com.android.support.test:runner:$supportTestVersion" androidTestCompile "org.mockito:mockito-core:$mockitoVersion" }