Skip to content

Commit 3812713

Browse files
committed
Update relevant ktlint refs to pinterest
1 parent 9713eda commit 3812713

File tree

10 files changed

+14
-16
lines changed

10 files changed

+14
-16
lines changed

CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ You might be looking for:
200200
### 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)))
201201

202202
* Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt).
203-
* Added support for Kotlin via [ktlint](https://github.com/shyiko/ktlint).
203+
* Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint).
204204
* Better error messages for JarState.
205205
* Improved test harnessing.
206206
* Formatter now has pluggable exception policies,

lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.diffplug.spotless.Provisioner;
3434
import com.diffplug.spotless.ThrowingEx;
3535

36-
/** Wraps up [ktlint](https://github.com/shyiko/ktlint) as a FormatterStep. */
36+
/** Wraps up [ktlint](https://github.com/pinterest/ktlint) as a FormatterStep. */
3737
public class KtLintStep {
3838
// prevent direct instantiation
3939
private KtLintStep() {}

plugin-gradle/CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
### 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))
216216

217217
* Added support for Scala via [scalafmt](https://github.com/olafurpg/scalafmt).
218-
* Added support for Kotlin via [ktlint](https://github.com/shyiko/ktlint).
218+
* Added support for Kotlin via [ktlint](https://github.com/pinterest/ktlint).
219219
* Added `FormatExtension::replaceStep`.
220220
* `paddedCell()` is no longer required if a misbehaving rule converges.
221221
* Any errors in a step will now fail the build - previously they were only warned.

plugin-gradle/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Spotless can check and apply formatting to any plain-text file, using simple rul
8383
* Google's [google-java-format](https://github.com/google/google-java-format)
8484
* [Groovy Eclipse](#groovy-eclipse)'s groovy code formatter
8585
* [FreshMark](https://github.com/diffplug/freshmark) (markdown with variables)
86-
* [ktlint](https://github.com/shyiko/ktlint)
86+
* [ktlint](https://github.com/pinterest/ktlint)
8787
* [scalafmt](https://github.com/olafurpg/scalafmt)
8888
* [DBeaver sql format](https://dbeaver.jkiss.org/)
8989
* [Prettier: An opinionated code formatter](https://prettier.io)
@@ -252,7 +252,7 @@ spotless {
252252

253253
<a name="ktlint"></a>
254254

255-
## Applying [ktlint](https://github.com/shyiko/ktlint) to Kotlin files
255+
## Applying [ktlint](https://github.com/pinterest/ktlint) to Kotlin files
256256

257257
```gradle
258258
spotless {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,17 @@
1515
*/
1616
package com.diffplug.gradle.spotless;
1717

18-
import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER;
19-
18+
import com.diffplug.spotless.FormatterStep;
19+
import com.diffplug.spotless.kotlin.KtLintStep;
2020
import java.util.Collections;
2121
import java.util.Map;
2222
import java.util.Objects;
23-
2423
import org.gradle.api.GradleException;
2524
import org.gradle.api.file.FileCollection;
2625
import org.gradle.api.plugins.JavaPluginConvention;
2726
import org.gradle.api.tasks.SourceSet;
2827

29-
import com.diffplug.spotless.FormatterStep;
30-
import com.diffplug.spotless.kotlin.KtLintStep;
28+
import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER;
3129

3230
public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense {
3331
static final String NAME = "kotlin";
@@ -46,7 +44,7 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
4644
return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER);
4745
}
4846

49-
/** Adds the specified version of [ktlint](https://github.com/shyiko/ktlint). */
47+
/** Adds the specified version of [ktlint](https://github.com/pinterest/ktlint). */
5048
public KotlinFormatExtension ktlint(String version) {
5149
Objects.requireNonNull(version);
5250
return new KotlinFormatExtension(version, Collections.emptyMap());

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public KotlinGradleExtension(SpotlessExtension rootExtension) {
3232
super(rootExtension);
3333
}
3434

35-
/** Adds the specified version of [ktlint](https://github.com/shyiko/ktlint). */
35+
/** Adds the specified version of [ktlint](https://github.com/pinterest/ktlint). */
3636
public KotlinFormatExtension ktlint(String version) {
3737
Objects.requireNonNull(version, "version");
3838
return new KotlinFormatExtension(version, Collections.emptyMap());

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void integration_default() throws IOException {
7474
}
7575

7676
@Test
77-
public void integration_shyiko() throws IOException {
77+
public void integration_pinterest() throws IOException {
7878
setFile("build.gradle").toLines(
7979
"plugins {",
8080
" id 'nebula.kotlin' version '1.0.6'",

plugin-maven/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ By default, all files matching `src/main/kotlin/**/*.kt` and `src/test/kotlin/**
162162
<endWithNewLine/>
163163
<trimTrailingWhitespace/>
164164
<ktlint>
165-
<!-- Optional, available versions: https://github.com/shyiko/ktlint/releases -->
165+
<!-- Optional, available versions: https://github.com/pinterest/ktlint/releases -->
166166
<version>0.14.0</version>
167167
</ktlint>
168168
</kotlin>

plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void testKtlint() throws Exception {
3737
}
3838

3939
@Test
40-
public void testKtlintShyiko() throws Exception {
40+
public void testKtlintPinterest() throws Exception {
4141
writePomWithKotlinSteps("<ktlint><version>0.21.0</version></ktlint>");
4242

4343
String path1 = "src/main/kotlin/main1.kt";

testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void behavior() throws Exception {
3939
}
4040

4141
@Test
42-
public void worksShyiko() throws Exception {
42+
public void worksPinterest() throws Exception {
4343
// Must use jcenter because `com.andreapivetta.kolor:kolor:0.0.2` isn't available on mavenCentral.
4444
// It is a dependency of ktlint.
4545
FormatterStep step = KtLintStep.create("0.31.0", TestProvisioner.jcenter());

0 commit comments

Comments
 (0)