From a35197a6da4c203157e5d98daab3c1be87bf92db Mon Sep 17 00:00:00 2001 From: Jeroen Mols Date: Sat, 10 Sep 2016 20:56:24 +0200 Subject: [PATCH 1/8] Updated installation instructions --- website/index.html | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/website/index.html b/website/index.html index f420d0789..e24eba310 100644 --- a/website/index.html +++ b/website/index.html @@ -211,10 +211,28 @@

Bonus

Add a static import for ButterKnife.findById and enjoy even more fun.

Download

-

Gradle

- 
compile 'com.jakewharton:butterknife:(insert latest version)'
-apt 'com.jakewharton:butterknife-compiler:(insert latest version)'
+ Configure your project-level build.gradle to include the 'android-apt' plugin: +

Project-level build.gradle

+ 
+buildscript {
+  repositories {
+    mavenCentral()
+   }
+  dependencies {
+    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+  }
+}
+
+ Then, apply the 'android-apt' plugin in your module-level build.gradle and add the Butter Knife dependencies: +

Module-level build.gradle

+ 
+apply plugin: 'android-apt'
 
+dependencies {
+  compile 'com.jakewharton:butterknife:(insert latest version)'
+  apt 'com.jakewharton:butterknife-compiler:(insert latest version)'
+}
+

License

Copyright 2013 Jake Wharton
 

From 1b8ebbcb5d2370159f63177d9ba51c4d5b4239b8 Mon Sep 17 00:00:00 2001
From: Jeroen Mols 
Date: Tue, 20 Sep 2016 10:56:07 +0200
Subject: [PATCH 2/8] incorporated review feedback

---
 website/index.html | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/website/index.html b/website/index.html
index e24eba310..066cdce2b 100644
--- a/website/index.html
+++ b/website/index.html
@@ -211,26 +211,23 @@ 
Bonus

             
Add a static import for ButterKnife.findById and enjoy even more fun.

 
             
Download

-            Configure your project-level build.gradle to include the 'android-apt' plugin:
+            Configure your project-level build.gradle to use at least version 2.2.0 of the Android Gradle Plugin:
             
Project-level build.gradle

             
 buildscript {
-  repositories {
-    mavenCentral()
-   }
-  dependencies {
-    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-  }
+    ...
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
+    }
 }
             

-            Then, apply the 'android-apt' plugin in your module-level build.gradle and add the Butter Knife dependencies:
+
+            Then add the Butter Knife dependencies to the module-level build.gradle:
             
Module-level build.gradle

             
-apply plugin: 'android-apt'
-
 dependencies {
-  compile 'com.jakewharton:butterknife:(insert latest version)'
-  apt 'com.jakewharton:butterknife-compiler:(insert latest version)'
+  compile 'com.jakewharton:butterknife:8.4.0'
+  compile 'com.jakewharton:butterknife-compiler:8.4.0'
 }
             

             
License


From 6943d05b249d954b7de95372f31db4d446c12442 Mon Sep 17 00:00:00 2001
From: Jeroen Mols 
Date: Tue, 20 Sep 2016 11:01:03 +0200
Subject: [PATCH 3/8] changed compiler dependency to annotationProcessor

---
 website/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/index.html b/website/index.html
index 066cdce2b..d167b7700 100644
--- a/website/index.html
+++ b/website/index.html
@@ -227,7 +227,7 @@ 
Module-level build.gradle

             
 dependencies {
   compile 'com.jakewharton:butterknife:8.4.0'
-  compile 'com.jakewharton:butterknife-compiler:8.4.0'
+  annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 }
             

             
License


From 8f2da25cec1da55b18755234347c4a6972dc84e9 Mon Sep 17 00:00:00 2001
From: Jeroen Mols 
Date: Tue, 20 Sep 2016 11:07:25 +0200
Subject: [PATCH 4/8] Updated installation instructions in readme for Android
 plugin 2.2.0

---
 README.md | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index a83adde5e..7ce9ec743 100644
--- a/README.md
+++ b/README.md
@@ -41,39 +41,26 @@ __Remember: A butter knife is like [a dagger][1] only infinitely less sharp.__
 Download
 --------
 
-Configure your project-level `build.gradle` to include the 'android-apt' plugin:
+Configure your project-level `build.gradle` to use at least vesion 2.2.0 of the Android Gradle Plugin:
 
 ```groovy
 buildscript {
-  repositories {
-    mavenCentral()
-   }
-  dependencies {
-    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-  }
+    ...
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
+    }
 }
 ```
 
-Then, apply the 'android-apt' plugin in your module-level `build.gradle` and add the Butter Knife
-dependencies:
+Then add the Butter Knife dependencies to your module-level `build.gradle`:
 
 ```groovy
-apply plugin: 'android-apt'
-
-android {
-  ...
-}
-
 dependencies {
   compile 'com.jakewharton:butterknife:8.4.0'
-  apt 'com.jakewharton:butterknife-compiler:8.4.0'
+  annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 }
 ```
 
-Note: If you are using the new Jack compiler with version 2.2.0 or newer you do not need the
-'android-apt' plugin and can instead replace `apt` with `annotationProcessor` when declaring the
-compiler dependency.
-
 Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap].
 
 

From 9133fbf2787a5281bc34f56718a3d64851535c26 Mon Sep 17 00:00:00 2001
From: Jeroen Mols 
Date: Tue, 20 Sep 2016 20:59:02 +0200
Subject: [PATCH 5/8] Changed indentation to two spaces

---
 README.md          | 8 ++++----
 website/index.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7ce9ec743..7892bd933 100644
--- a/README.md
+++ b/README.md
@@ -45,10 +45,10 @@ Configure your project-level `build.gradle` to use at least vesion 2.2.0 of the
 
 ```groovy
 buildscript {
-    ...
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
-    }
+  ...
+  dependencies {
+    classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
+  }
 }
 ```
 
diff --git a/website/index.html b/website/index.html
index d167b7700..6e8d82db5 100644
--- a/website/index.html
+++ b/website/index.html
@@ -215,10 +215,10 @@ 
Download

             
Project-level build.gradle

             
 buildscript {
-    ...
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
-    }
+  ...
+  dependencies {
+    classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
+  }
 }
             

 

From e72a1b1a1ab0cdecc212b45a2873b6c8bb6eea44 Mon Sep 17 00:00:00 2001
From: Jeroen Mols 
Date: Tue, 20 Sep 2016 21:02:40 +0200
Subject: [PATCH 6/8] Removed comment behind gradle version

---
 README.md          | 2 +-
 website/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7892bd933..9b0c2d1e8 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Configure your project-level `build.gradle` to use at least vesion 2.2.0 of the
 buildscript {
   ...
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
+    classpath 'com.android.tools.build:gradle:2.2.0'
   }
 }
 ```
diff --git a/website/index.html b/website/index.html
index 6e8d82db5..b88791c95 100644
--- a/website/index.html
+++ b/website/index.html
@@ -217,7 +217,7 @@ 
Project-level build.gradle

 buildscript {
   ...
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.2.0'  // 2.2.0 or higher
+    classpath 'com.android.tools.build:gradle:2.2.0'
   }
 }
From 10a40ceae77ec5e8ed91bf464efde390a0d87504 Mon Sep 17 00:00:00 2001 From: Jeroen Mols Date: Tue, 20 Sep 2016 21:03:21 +0200 Subject: [PATCH 7/8] Use latest version span --- website/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/index.html b/website/index.html index b88791c95..5ed944728 100644 --- a/website/index.html +++ b/website/index.html @@ -226,8 +226,8 @@

Project-level build.gradle

Module-level build.gradle

 dependencies {
-  compile 'com.jakewharton:butterknife:8.4.0'
-  annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
+  compile 'com.jakewharton:butterknife:(latest version)'
+  annotationProcessor 'com.jakewharton:butterknife-compiler:(latest version)'
 }

License

From 3c97ddefacaa3706a658f38caddad71e694ffaf1 Mon Sep 17 00:00:00 2001 From: Jeroen Mols Date: Sun, 27 Nov 2016 11:41:02 +0100 Subject: [PATCH 8/8] Removed redundant and tags --- website/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/index.html b/website/index.html index 5ed944728..982bec62e 100644 --- a/website/index.html +++ b/website/index.html @@ -226,8 +226,8 @@

Project-level build.gradle

Module-level build.gradle

 dependencies {
-  compile 'com.jakewharton:butterknife:(latest version)'
-  annotationProcessor 'com.jakewharton:butterknife-compiler:(latest version)'
+  compile 'com.jakewharton:butterknife:(latest version)'
+  annotationProcessor 'com.jakewharton:butterknife-compiler:(latest version)'
 }

License

@@ -250,7 +250,7 @@

License

- +