Merge pull request #1096 from JakeWharton/jw/stuff/2017-10-06

Stuff
JakeWharton · Oct 7, 2017 · daa688a · daa688a
2 parents 344b187 + 77824fb
commit daa688a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,6 @@ buildscript {
   ext.versions = [
       'minSdk': 14,
       'compileSdk': 26,
-      'buildTools': '26.0.1',
 
       'supportLibrary': '26.0.2',
       'androidPlugin': '3.0.0-beta7',
@@ -42,6 +41,7 @@ buildscript {
           'service': 'com.google.auto.service:auto-service:1.0-rc3',
           'common': 'com.google.auto:auto-common:0.8',
       ],
+      'guava': 'com.google.guava:guava:23.0',
       'release': [
           'runtime': "com.jakewharton:butterknife:${versions.release}",
           'compiler': "com.jakewharton:butterknife-compiler:${versions.release}"

diff --git a/butterknife-compiler/build.gradle b/butterknife-compiler/build.gradle
@@ -7,6 +7,7 @@ targetCompatibility = JavaVersion.VERSION_1_7
 dependencies {
   implementation project(':butterknife-annotations')
   implementation deps.auto.common
+  implementation deps.guava
   api deps.javapoet
   compileOnly deps.auto.service
   compileOnly files(org.gradle.internal.jvm.Jvm.current().getToolsJar())

diff --git a/butterknife-integration-test/build.gradle b/butterknife-integration-test/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion versions.compileSdk
-  buildToolsVersion versions.buildTools
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_7

diff --git a/butterknife/build.gradle b/butterknife/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion versions.compileSdk
-  buildToolsVersion versions.buildTools
 
   defaultConfig {
     minSdkVersion versions.minSdk

diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion versions.compileSdk
-  buildToolsVersion versions.buildTools
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_7

diff --git a/sample/library/build.gradle b/sample/library/build.gradle
@@ -15,7 +15,6 @@ apply plugin: 'com.jakewharton.butterknife'
 
 android {
   compileSdkVersion versions.compileSdk
-  buildToolsVersion versions.buildTools
 
   defaultConfig {
     minSdkVersion versions.minSdk