From 25ba1b81a69450fdce9ac25f3ece2f30ed73c7eb Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:24:01 +0200 Subject: [PATCH 01/14] Update: * targetSdk * compileSdk * buildTools * supportVersion --- build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 346ca5e3..8219c4ea 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,11 +25,11 @@ 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' + TARGET_SDK_VERSION = 26 + COMPILE_SDK_VERSION = 26 + BUILD_TOOLS_VERSION = '26.0.1' - supportLibraryVersion = '25.2.0' + supportLibraryVersion = '26.0.0' bintrayVersion = '0.5.0' junitVersion = '4.12' From fa247fedab4b2f94044c37bdc5cbb39357597a9e Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:27:38 +0200 Subject: [PATCH 02/14] Document and extract compositeAndroidVersion --- build.gradle | 3 +++ plugin/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8219c4ea..4f72ed55 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,9 @@ ext { BUILD_TOOLS_VERSION = '26.0.1' 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' 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 { From 6ec6c5e6596fcbe765d9621adfe9f159ee7a0fb0 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:29:33 +0200 Subject: [PATCH 03/14] Update assertJ and mockito version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4f72ed55..4f0b7cac 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,6 @@ ext { bintrayVersion = '0.5.0' junitVersion = '4.12' - mockitoVersion = '1.10.19' - assertjVersion = '2.5.0' + mockitoVersion = '2.10.0' + assertjVersion = '2.8.0' } From ee739428229d137c360760f69c6c4821672ecb70 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:33:31 +0200 Subject: [PATCH 04/14] Extract atsl- & espresso version --- build.gradle | 2 ++ plugin-test/build.gradle | 6 +++--- thirtyinch/build.gradle | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 4f0b7cac..d1c679a4 100644 --- a/build.gradle +++ b/build.gradle @@ -38,4 +38,6 @@ ext { junitVersion = '4.12' mockitoVersion = '2.10.0' assertjVersion = '2.8.0' + atslVersion = '0.5' + espressoVersion = '2.2.2' } diff --git a/plugin-test/build.gradle b/plugin-test/build.gradle index d51513e9..83ce39db 100644 --- a/plugin-test/build.gradle +++ b/plugin-test/build.gradle @@ -32,7 +32,7 @@ dependencies { 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.test:runner:$atslVersion"; + androidTestCompile "com.android.support.test:rules:$atslVersion"; + androidTestCompile "com.android.support.test.espresso:espresso-core:$espressoVersion"; } diff --git a/thirtyinch/build.gradle b/thirtyinch/build.gradle index 290cae18..db47b3ad 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:$atslVersion" androidTestCompile "org.mockito:mockito-core:$mockitoVersion" } From e685a08289da674bb98eac991d989883ebff1d7c Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:36:28 +0200 Subject: [PATCH 05/14] Replace whole appCompat with annotations dep --- plugin-test/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-test/build.gradle b/plugin-test/build.gradle index 83ce39db..e308e541 100644 --- a/plugin-test/build.gradle +++ b/plugin-test/build.gradle @@ -31,7 +31,7 @@ dependencies { compile "com.pascalwelsch.compositeandroid:activity:$supportLibraryVersion" compile "com.pascalwelsch.compositeandroid:fragment:$supportLibraryVersion" - androidTestCompile "com.android.support:appcompat-v7:$supportLibraryVersion" + androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion" androidTestCompile "com.android.support.test:runner:$atslVersion"; androidTestCompile "com.android.support.test:rules:$atslVersion"; androidTestCompile "com.android.support.test.espresso:espresso-core:$espressoVersion"; From d49999807d2a3426c35c04e7bcb8b23ee13742c4 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:40:22 +0200 Subject: [PATCH 06/14] Update atsl- and espresso version --- build.gradle | 4 ++-- plugin-test/build.gradle | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d1c679a4..e2d83042 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,6 @@ ext { junitVersion = '4.12' mockitoVersion = '2.10.0' assertjVersion = '2.8.0' - atslVersion = '0.5' - espressoVersion = '2.2.2' + atslVersion = '1.0.1' + espressoVersion = '3.0.1' } diff --git a/plugin-test/build.gradle b/plugin-test/build.gradle index e308e541..e220cd34 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 { From 91ad7dd9415b60e7d43943a4f6f076d136aa0634 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:41:52 +0200 Subject: [PATCH 07/14] Update rxjava(1) dependencies --- rx/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From 70e19ec3c07dcada8b48d70c7691294865cbfedf Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:42:46 +0200 Subject: [PATCH 08/14] Update rxjava(2) --- rx2/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From bbe0ee63bfd82569b0ea4b4ebcd6239504016473 Mon Sep 17 00:00:00 2001 From: StefMa Date: Tue, 26 Sep 2017 15:55:54 +0200 Subject: [PATCH 09/14] Clean workspace before build/test. Because cleaning is always a good approche, isn't it? ;) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93bc47e1..863e8e72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_script: - adb shell input keyevent 82 & script: - - ./gradlew build jacocoTestReport assembleAndroidTest connectedCheck + - ./gradlew clean build jacocoTestReport assembleAndroidTest connectedCheck after_success: - bash <(curl -s https://codecov.io/bash) \ No newline at end of file From df278162c0f6edb40e8eab1ae657c0169466d2f8 Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 27 Sep 2017 08:48:49 +0200 Subject: [PATCH 10/14] Add travis comment to sdk version --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index e2d83042..35b94e6e 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ ext { VERSION_NAME = "0.8.1-SNAPSHOT" VERSION_CODE = 6 MIN_SDK_VERSION = 14 + // If you change the SDK version don't forgot to update .travis.yml TARGET_SDK_VERSION = 26 COMPILE_SDK_VERSION = 26 BUILD_TOOLS_VERSION = '26.0.1' From a2839a19ba432362012123aacb3d0c5ba9983a08 Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 27 Sep 2017 08:49:52 +0200 Subject: [PATCH 11/14] Rename atsl to supportTest --- build.gradle | 2 +- plugin-test/build.gradle | 4 ++-- thirtyinch/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 35b94e6e..ec84dc60 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,6 @@ ext { junitVersion = '4.12' mockitoVersion = '2.10.0' assertjVersion = '2.8.0' - atslVersion = '1.0.1' + supportTestVersion = '1.0.1' espressoVersion = '3.0.1' } diff --git a/plugin-test/build.gradle b/plugin-test/build.gradle index e220cd34..c79a856d 100644 --- a/plugin-test/build.gradle +++ b/plugin-test/build.gradle @@ -30,7 +30,7 @@ dependencies { compile "com.pascalwelsch.compositeandroid:fragment:$supportLibraryVersion" androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion" - androidTestCompile "com.android.support.test:runner:$atslVersion"; - androidTestCompile "com.android.support.test:rules:$atslVersion"; + 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/thirtyinch/build.gradle b/thirtyinch/build.gradle index db47b3ad..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:$atslVersion" + androidTestCompile "com.android.support.test:runner:$supportTestVersion" androidTestCompile "org.mockito:mockito-core:$mockitoVersion" } From 47c43083ec4cd2f017677d1e320b498d3c52c4d9 Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 27 Sep 2017 08:50:50 +0200 Subject: [PATCH 12/14] Update travis to API 26 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 863e8e72..8b293cf3 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 From 5381b66a4472a49c04145c4620f09ce48e1a4bde Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 27 Sep 2017 08:52:12 +0200 Subject: [PATCH 13/14] Revert "Clean workspace before build/test. Because cleaning is always a good approche, isn't it? ;)" This reverts commit bbe0ee63bfd82569b0ea4b4ebcd6239504016473. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b293cf3..b7843646 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_script: - adb shell input keyevent 82 & script: - - ./gradlew clean build jacocoTestReport assembleAndroidTest connectedCheck + - ./gradlew build jacocoTestReport assembleAndroidTest connectedCheck after_success: - bash <(curl -s https://codecov.io/bash) \ No newline at end of file From 710f7a568f306d92dff42efa79ff044e5cdbb93a Mon Sep 17 00:00:00 2001 From: StefMa Date: Wed, 27 Sep 2017 12:02:59 +0200 Subject: [PATCH 14/14] Add travis comment to build tools --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index ec84dc60..3b3dd0db 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ ext { // 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 = '26.0.0'