Skip to content

Commit

Permalink
Upgrade to ktlint 0.12.1 and bump versions of kotlin and gradle (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremymailen authored Nov 23, 2017
1 parent 31091a7 commit ebdf377
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0'
id 'org.jmailen.kotlinter' version '1.5.1'
}
```

Expand Down Expand Up @@ -93,7 +93,7 @@ If you need to use a different version of `ktlint` you can override the dependen
```groovy
buildscript {
configurations.classpath {
resolutionStrategy { force 'com.github.shyiko:ktlint:0.7.1' }
resolutionStrategy { force 'com.github.shyiko:ktlint:0.11.1' }
}
}
```
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.1.51'
id 'org.jetbrains.kotlin.jvm' version '1.1.60'
id 'com.gradle.plugin-publish' version '0.9.8'
id 'java-gradle-plugin'
id 'maven-publish'
Expand All @@ -12,15 +12,15 @@ repositories {
}

dependencies {
compile 'com.github.shyiko:ktlint:0.11.1'
compile 'com.github.shyiko:ktlint:0.12.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'
testRuntime 'com.android.tools.build:gradle:2.3.3'
}

version = '1.5.0'
version = '1.5.1'
group = 'org.jmailen.gradle'
def pluginId = 'org.jmailen.kotlinter'

Expand Down Expand Up @@ -56,5 +56,5 @@ publishing {
}

task wrapper(type: Wrapper) {
gradleVersion = '4.2.1'
gradleVersion = '4.3.1'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip

0 comments on commit ebdf377

Please sign in to comment.