From 99d90710dfe379da436586890d044916edb2724e Mon Sep 17 00:00:00 2001
From: Jeremy Mailen <jeremy@gladly.com>
Date: Sun, 23 Jul 2017 23:53:05 -0700
Subject: [PATCH 1/2] Version 1.2.0: compatibility with Kotlin 1.1.3 plugins

Fixes #13
---
 README.md    | 8 +++++++-
 build.gradle | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 84962e90..9a62e4e9 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,16 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm
 
 ```groovy
 plugins {
-    id 'org.jmailen.kotlinter' version '1.1.0'
+    id 'org.jmailen.kotlinter' version '1.2.0'
 }
 ```
 
+### Compatibility
+
+Kotlinter 1.2.0 and later compatible with Kotlin Gradle plugins 1.1.3+
+
+Kotlinter 1.1.0 and earlier compatible with Kotlin Gradle plugins 1.1 - 1.1.2-5
+
 ### Features
 - Extends Kotlin JVM and Android projects with lint and format tasks for each `SourceSet`
 - Standalone `LintTask` and `FormatTask` types for defining custom tasks
diff --git a/build.gradle b/build.gradle
index 1b56bf98..b2246ea6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,15 +12,15 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.shyiko:ktlint:0.8.3'
-    compileOnly 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-5'
+    compile 'com.github.shyiko:ktlint:0.9.0'
+    compileOnly 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3-2'
     compileOnly 'com.android.tools.build:gradle:2.3.3'
     testCompile 'junit:junit:4.12'
-    testRuntime 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-5'
+    testRuntime 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3-2'
     testRuntime 'com.android.tools.build:gradle:2.3.3'
 }
 
-version = '1.1.0'
+version = '1.2.0'
 group = 'org.jmailen.gradle'
 def pluginId = 'org.jmailen.kotlinter'
 

From aed8de3dec7875d4316656af1b3e311e1bef50c4 Mon Sep 17 00:00:00 2001
From: Jeremy Mailen <jeremy@gladly.com>
Date: Fri, 4 Aug 2017 21:58:05 -0700
Subject: [PATCH 2/2] Upgrade ktlint to 0.9.1

---
 README.md                                |   2 +-
 build.gradle                             |  12 ++++++------
 gradle/wrapper/gradle-wrapper.jar        | Bin 54706 -> 54712 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 9a62e4e9..f3c8fa51 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm
 
 ```groovy
 plugins {
-    id 'org.jmailen.kotlinter' version '1.2.0'
+    id 'org.jmailen.kotlinter' version '1.2.1'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index b2246ea6..7ec1361e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.1.2-5'
+    id 'org.jetbrains.kotlin.jvm' version '1.1.3-2'
     id 'com.gradle.plugin-publish' version '0.9.7'
     id 'java-gradle-plugin'
     id 'maven-publish'
@@ -12,15 +12,15 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.shyiko:ktlint:0.9.0'
-    compileOnly 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3-2'
+    compile 'com.github.shyiko:ktlint:0.9.1'
+    compileOnly 'org.jetbrains.kotlin:kotlin-gradle-plugin'
     compileOnly 'com.android.tools.build:gradle:2.3.3'
     testCompile 'junit:junit:4.12'
-    testRuntime 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3-2'
+    testRuntime 'org.jetbrains.kotlin:kotlin-gradle-plugin'
     testRuntime 'com.android.tools.build:gradle:2.3.3'
 }
 
-version = '1.2.0'
+version = '1.2.1'
 group = 'org.jmailen.gradle'
 def pluginId = 'org.jmailen.kotlinter'
 
@@ -56,5 +56,5 @@ publishing {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.0'
+    gradleVersion = '4.0.2'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c6f4098d265faa1187d1f2ed14459753d081d4d6..9befc6cf8793ac0e7dc98d14823b657f6c378b27 100644
GIT binary patch
delta 771
zcmYk4T}YEr7{}l9DD%~(y?)G(x0$#!^&QGAOrwDggH}TrmX#G*k!AFW7eRDUqbLxq
zwLc-1B1Lyf<shhw(%6T(xv6vB<dt`l7iryeS7*m*9ypxm_kaG+bIyUsJDl=qIK^F`
zE_ays*d$3h{;a7rW4UO#Xsvs#n@MhU)NA#ncE3w?;FoWI-t1nIoQ^d4uDgBG!0oww
zqcmVdyWjl32m1U+*#MUOwQL-@fd;mM*CqM55YT8RLurix4yNJ@$CJ7QdM0G_>11RD
zHL|8{C?|r=G?>0YpMw@!DOe{vEfyvsbW9wfo)Qs`PaLFLQ!>=yqA42{Aq7>{ik`nQ
zxk{?JAs;Q(Sr`i{@Jy<dUc;p_;jO6K>MgG02_w`g3*EDez9V)$u1{%{;}F>BD96gQ
zg551!%Zx3_WF}G;@=+gB$$m^oU7<s)5+6dRDD@0RLq=4F8(22Zhn?&eykRRF!q4zo
z(z>u3F2d=qGW1SsG;<BMAtU0`HtM_~!o|+*JfomBqEg_dka{Bf*eiUCw9(_+a78Q8
z6m4Y1xF0>oFIb9Rp*9!y?Sk7?j;k>RZ)a5c{Xj@H4~_UcqmiLkptE-e!rXCZR;7Zc
z>r%fCUuT;r!?TGFk0SaUo>Qst`KJ72?f@D3lbGX)Y4qnslJsbNnW)hyHXx+T!EAo7
zg2k9hRYP2|3AE3vbomWO6CTZ5DCZ;eaTC7JTi6e5i?`G2802xQ_`f%<GCv~mOVsbf
kdta&9>0p#6<w>$EONoiyI;4dgBOuOYxE9R1W`6?y0nJnp?f?J)

delta 673
zcmYL{T}YEr9LC@Cx3;29-?fVEU7?stzA|%$HNRq!RJdka8f0l7#A=mHDl#yHL@+N3
ztq0Lih`hCnjEX@9igW5V-R6`iyeNo9AJ7L;w;d0b=j!)7&w2iE_@BUV+SB2*o;~Zk
z0-ZN1B}uBg=Qygl_3Y<WCiN&IFDfS1EDa{B@q3~)Lz3K1?YgCbKZ=oGG{6z8UabMa
zTGo$L(8fk#p0ra+!jI5q_$F0Sn7|`UL4H)md5x^&16EF*hKJjr3l)=HE3h%NpFO~%
zPz_7rd*~FsHi^2<oF(f0nev8zWl8G9lc^JA&Bn--1-@(p?9(b)tfJwzW}u79wS_{~
zlxPv3E+%uyiqs=-MrAkQnK?}9PGP!Sdbph?yqQtS<XW+eu!dEtsuR*5K1ezB0;Az7
zCczLnMtU!--dx;`sH_QrNCgde@zT2s8H+MXqYCBuxHRLmFGpBI+=?`z-M<xYqx<Nr
zpJRbYj?XGI-i-InJK$K5@tDiL>$uXs9baZ`)X^d^)S}?zoJ!_aAsbpZVw6jLn~?4{
z3r}V2jw#FoPwX0f>kz@G*a2ohQT!qqyJ73gM??1(>`lt}99KwlUsyX6WwfbRU}LXA
zq|Xxyuf-E**e}@TFVWnfm^L<FPPq>SW+e~Nxgn0(xRWem>3Ef_WglT!sApesdEo+$
mjpN;TIe(zafU?EH%;i7z|0D5bnpPLe=>u*r7HBGi%jRE;kOX}I

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b404a57e..80707392 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 19 19:38:57 PDT 2017
+#Fri Aug 04 21:51:37 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip