From 70cc4114333df2e780cce2ad2ab7b677d33321f9 Mon Sep 17 00:00:00 2001 From: Omar Alejandro Mainegra Sarduy Date: Wed, 6 Dec 2017 15:41:13 -0500 Subject: [PATCH 1/2] Bump libraries and sdk version --- build.gradle | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index c4a3c01..d8aa065 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,8 @@ buildscript { ext.versions = [ 'minSdk': 14, - 'compileSdk': 26, - 'buildTools': '26.0.2', - 'supportLibrary': '26.0.2' + 'compileSdk': 27, + 'supportLibrary': '27.0.2' ] ext.deps = [ @@ -19,14 +18,14 @@ buildscript { ], 'junit': 'junit:junit:4.12', 'assertj': 'org.assertj:assertj-core:3.8.0', - 'mockito': 'org.mockito:mockito-core:2.10.0', + 'mockito': 'org.mockito:mockito-core:2.13.0', 'robolectric': 'org.robolectric:robolectric:3.4.2', 'antTasks': 'org.apache.maven:maven-ant-tasks:2.1.3', ] dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-rc1' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' } repositories { From b274b1d93faf4f376d46fa5616b0d750a0be76b3 Mon Sep 17 00:00:00 2001 From: Omar Alejandro Mainegra Sarduy Date: Wed, 6 Dec 2017 15:42:15 -0500 Subject: [PATCH 2/2] Remove buildToolsVersion as it's not longer required --- flow-sample-basic/build.gradle | 1 - flow-sample-helloworld/build.gradle | 1 - flow-sample-intents/build.gradle | 1 - flow-sample-multikey/build.gradle | 1 - flow-sample-orientation-lock/build.gradle | 1 - flow-sample-tree/build.gradle | 1 - flow/build.gradle | 1 - 7 files changed, 7 deletions(-) diff --git a/flow-sample-basic/build.gradle b/flow-sample-basic/build.gradle index bd9bd20..9236392 100644 --- a/flow-sample-basic/build.gradle +++ b/flow-sample-basic/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "flow.sample.basic" diff --git a/flow-sample-helloworld/build.gradle b/flow-sample-helloworld/build.gradle index 3b34a99..4998aa9 100644 --- a/flow-sample-helloworld/build.gradle +++ b/flow-sample-helloworld/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "flow.sample.helloworld" diff --git a/flow-sample-intents/build.gradle b/flow-sample-intents/build.gradle index 9e0f1a1..6436fc0 100644 --- a/flow-sample-intents/build.gradle +++ b/flow-sample-intents/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "flow.sample.intents" diff --git a/flow-sample-multikey/build.gradle b/flow-sample-multikey/build.gradle index 472ad0c..1dd05a5 100644 --- a/flow-sample-multikey/build.gradle +++ b/flow-sample-multikey/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "flow.sample.multikey" diff --git a/flow-sample-orientation-lock/build.gradle b/flow-sample-orientation-lock/build.gradle index 48f6d0e..319d940 100644 --- a/flow-sample-orientation-lock/build.gradle +++ b/flow-sample-orientation-lock/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "flow.sample.orientation" diff --git a/flow-sample-tree/build.gradle b/flow-sample-tree/build.gradle index 94c1f11..217ec52 100644 --- a/flow-sample-tree/build.gradle +++ b/flow-sample-tree/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "flow.sample.tree" diff --git a/flow/build.gradle b/flow/build.gradle index 2b05fe6..814cb98 100644 --- a/flow/build.gradle +++ b/flow/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { minSdkVersion versions.minSdk