Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.2.1 #15

Merged
merged 3 commits into from
Aug 5, 2017
Merged

1.2.1 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99d9071
Version 1.2.0: compatibility with Kotlin 1.1.3 plugins
Jul 24, 2017
aed8de3
Upgrade ktlint to 0.9.1
Aug 5, 2017
72afd2b
Merge branch 'master' into 1.2.1
jeremymailen Aug 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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.2.0'
id 'org.jmailen.kotlinter' version '1.2.1'
}
```

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'

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

task wrapper(type: Wrapper) {
gradleVersion = '4.0'
gradleVersion = '4.0.2'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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