From 3812713fcb45a4c85df8717c0c358a1ce1cb9968 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sat, 5 Oct 2019 22:18:40 -0400 Subject: [PATCH] Update relevant ktlint refs to pinterest --- CHANGES.md | 2 +- .../java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +- plugin-gradle/CHANGES.md | 2 +- plugin-gradle/README.md | 4 ++-- .../com/diffplug/gradle/spotless/KotlinExtension.java | 10 ++++------ .../gradle/spotless/KotlinGradleExtension.java | 2 +- .../gradle/spotless/KotlinGradleExtensionTest.java | 2 +- plugin-maven/README.md | 2 +- .../com/diffplug/spotless/maven/kotlin/KtlintTest.java | 2 +- .../com/diffplug/spotless/kotlin/KtLintStepTest.java | 2 +- 10 files changed, 14 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4b076edec7..922bf4afbe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -200,7 +200,7 @@ You might be looking for: ### Version 1.1.0 - February 27th 2017 (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/1.1.0/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/1.1.0/), artifact [lib]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib), [lib-extra]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib-extra))) * Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt). -* Added support for Kotlin via [ktlint](https://github.com/shyiko/ktlint). +* Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint). * Better error messages for JarState. * Improved test harnessing. * Formatter now has pluggable exception policies, diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java index 9e0f6db433..8ccd45cf07 100644 --- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java +++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java @@ -33,7 +33,7 @@ import com.diffplug.spotless.Provisioner; import com.diffplug.spotless.ThrowingEx; -/** Wraps up [ktlint](https://github.com/shyiko/ktlint) as a FormatterStep. */ +/** Wraps up [ktlint](https://github.com/pinterest/ktlint) as a FormatterStep. */ public class KtLintStep { // prevent direct instantiation private KtLintStep() {} diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 914b2404e4..a20f9fab04 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -215,7 +215,7 @@ ### Version 3.1.0 - February 27th 2017 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.1.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-plugin-gradle/3.1.0)) * Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt). -* Added support for Kotlin via [ktlint](https://github.com/shyiko/ktlint). +* Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint). * Added `FormatExtension::replaceStep`. * `paddedCell()` is no longer required if a misbehaving rule converges. * Any errors in a step will now fail the build - previously they were only warned. diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index 8ffb612293..ff2769b3be 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -83,7 +83,7 @@ Spotless can check and apply formatting to any plain-text file, using simple rul * Google's [google-java-format](https://github.com/google/google-java-format) * [Groovy Eclipse](#groovy-eclipse)'s groovy code formatter * [FreshMark](https://github.com/diffplug/freshmark) (markdown with variables) -* [ktlint](https://github.com/shyiko/ktlint) +* [ktlint](https://github.com/pinterest/ktlint) * [scalafmt](https://github.com/olafurpg/scalafmt) * [DBeaver sql format](https://dbeaver.jkiss.org/) * [Prettier: An opinionated code formatter](https://prettier.io) @@ -252,7 +252,7 @@ spotless { -## Applying [ktlint](https://github.com/shyiko/ktlint) to Kotlin files +## Applying [ktlint](https://github.com/pinterest/ktlint) to Kotlin files ```gradle spotless { diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java index 96b74a1064..41bf11ae6d 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java @@ -15,19 +15,17 @@ */ package com.diffplug.gradle.spotless; -import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER; - +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.kotlin.KtLintStep; import java.util.Collections; import java.util.Map; import java.util.Objects; - import org.gradle.api.GradleException; import org.gradle.api.file.FileCollection; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.SourceSet; -import com.diffplug.spotless.FormatterStep; -import com.diffplug.spotless.kotlin.KtLintStep; +import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER; public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense { static final String NAME = "kotlin"; @@ -46,7 +44,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) { return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER); } - /** Adds the specified version of [ktlint](https://github.com/shyiko/ktlint). */ + /** Adds the specified version of [ktlint](https://github.com/pinterest/ktlint). */ public KotlinFormatExtension ktlint(String version) { Objects.requireNonNull(version); return new KotlinFormatExtension(version, Collections.emptyMap()); diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java index 144bb19c46..88fcc80185 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java @@ -32,7 +32,7 @@ public KotlinGradleExtension(SpotlessExtension rootExtension) { super(rootExtension); } - /** Adds the specified version of [ktlint](https://github.com/shyiko/ktlint). */ + /** Adds the specified version of [ktlint](https://github.com/pinterest/ktlint). */ public KotlinFormatExtension ktlint(String version) { Objects.requireNonNull(version, "version"); return new KotlinFormatExtension(version, Collections.emptyMap()); diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java index e4cf7cc428..64a008b6d4 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java @@ -74,7 +74,7 @@ public void integration_default() throws IOException { } @Test - public void integration_shyiko() throws IOException { + public void integration_pinterest() throws IOException { setFile("build.gradle").toLines( "plugins {", " id 'nebula.kotlin' version '1.0.6'", diff --git a/plugin-maven/README.md b/plugin-maven/README.md index c8060e1e89..e5e57cb1fd 100644 --- a/plugin-maven/README.md +++ b/plugin-maven/README.md @@ -162,7 +162,7 @@ By default, all files matching `src/main/kotlin/**/*.kt` and `src/test/kotlin/** - + 0.14.0 diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java index 20be89f920..ea0e807b4f 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java @@ -37,7 +37,7 @@ public void testKtlint() throws Exception { } @Test - public void testKtlintShyiko() throws Exception { + public void testKtlintPinterest() throws Exception { writePomWithKotlinSteps("0.21.0"); String path1 = "src/main/kotlin/main1.kt"; diff --git a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java index 921e11980e..4d5d8c9e62 100644 --- a/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java @@ -39,7 +39,7 @@ public void behavior() throws Exception { } @Test - public void worksShyiko() throws Exception { + public void worksPinterest() throws Exception { // Must use jcenter because `com.andreapivetta.kolor:kolor:0.0.2` isn't available on mavenCentral. // It is a dependency of ktlint. FormatterStep step = KtLintStep.create("0.31.0", TestProvisioner.jcenter());