Skip to content

Commit 9468aa3

Browse files
Merge pull request #2990 from pinterest/1.6.0-update-refs
Updated refs to latest (1.6.0) release
2 parents 947ff8d + f5a0632 commit 9468aa3

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

documentation/release-latest/docs/install/cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ All releases of `ktlint` can be downloaded from the [releases](https://github.co
1212
A particular version of `ktlint` can be downloaded with next command which also changes the file to an executable in directory `/usr/local/bin`:
1313

1414
```sh title="Download"
15-
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
15+
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.6.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
1616
```
1717

1818
!!! tip "Curl not installed or behind proxy"
@@ -207,6 +207,6 @@ Options `--stdin` and `--patterns-from-stdin` are mutually exclusive, only one o
207207

208208
Microsoft Windows is not able to run the `ktlint` command directly. Ktlint can be run in following ways on Microsoft Windows:
209209

210-
1. Use the `ktlint.bat` batch file provided as part of the [release](https://github.com/pinterest/ktlint/releases/tag/1.5.0). Add the batch file to your `%PATH%` environment variable for easy access
210+
1. Use the `ktlint.bat` batch file provided as part of the [release](https://github.com/pinterest/ktlint/releases/tag/1.6.0). Add the batch file to your `%PATH%` environment variable for easy access
211211
2. Run `ktlint` using Git Bash
212212
3. Run as `java -jar ktlint`

documentation/release-latest/docs/install/integrations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ See [cli usage](../cli) for arguments that can be supplied to `ktlint`.
5656
<dependency>
5757
<groupId>com.pinterest.ktlint</groupId>
5858
<artifactId>ktlint-cli</artifactId>
59-
<version>1.5.0</version>
59+
<version>1.6.0</version>
6060
</dependency>
6161
<!-- additional 3rd party ruleset(s) can be specified here -->
6262
</dependencies>
@@ -117,7 +117,7 @@ configurations {
117117
}
118118
119119
dependencies {
120-
ktlint("com.pinterest.ktlint:ktlint-cli:1.5.0") {
120+
ktlint("com.pinterest.ktlint:ktlint-cli:1.6.0") {
121121
attributes {
122122
attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL))
123123
}
@@ -167,7 +167,7 @@ The configuration below, defines following task:
167167
val ktlint by configurations.creating
168168

169169
dependencies {
170-
ktlint("com.pinterest.ktlint:ktlint-cli:1.5.0") {
170+
ktlint("com.pinterest.ktlint:ktlint-cli:1.6.0") {
171171
attributes {
172172
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
173173
}

documentation/release-latest/docs/rules/standard.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ Multiple annotations should be on a separate line than the annotated declaration
5050
}
5151
```
5252

53+
| Configuration setting | ktlint_official | intellij_idea | android_studio |
54+
|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------:|:-------------:|:--------------:|
55+
| `ktlint_annotation_handle_annotations_with_parameters_same_as_annotations_without_parameters`<br/><i>Handle listed annotations identical to annotations without parameters. Value is a comma separated list of names without the `@` prefix. Use `*` for all annotations with parameters.</i> | `unset` | `unset` | `unset` |
56+
5357
Rule id: `standard:annotation`
5458

5559
Suppress or disable rule (1)

documentation/snapshot/docs/install/cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ All releases of `ktlint` can be downloaded from the [releases](https://github.co
1212
A particular version of `ktlint` can be downloaded with next command which also changes the file to an executable in directory `/usr/local/bin`:
1313

1414
```sh title="Download"
15-
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
15+
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.6.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
1616
```
1717

1818
!!! tip "Curl not installed or behind proxy"
@@ -207,6 +207,6 @@ Options `--stdin` and `--patterns-from-stdin` are mutually exclusive, only one o
207207

208208
Microsoft Windows is not able to run the `ktlint` command directly. Ktlint can be run in following ways on Microsoft Windows:
209209

210-
1. Use the `ktlint.bat` batch file provided as part of the [release](https://github.com/pinterest/ktlint/releases/tag/1.5.0). Add the batch file to your `%PATH%` environment variable for easy access
210+
1. Use the `ktlint.bat` batch file provided as part of the [release](https://github.com/pinterest/ktlint/releases/tag/1.6.0). Add the batch file to your `%PATH%` environment variable for easy access
211211
2. Run `ktlint` using Git Bash
212212
3. Run as `java -jar ktlint`

documentation/snapshot/docs/install/integrations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ See [cli usage](../cli) for arguments that can be supplied to `ktlint`.
5656
<dependency>
5757
<groupId>com.pinterest.ktlint</groupId>
5858
<artifactId>ktlint-cli</artifactId>
59-
<version>1.5.0</version>
59+
<version>1.6.0</version>
6060
</dependency>
6161
<!-- additional 3rd party ruleset(s) can be specified here -->
6262
</dependencies>
@@ -117,7 +117,7 @@ configurations {
117117
}
118118
119119
dependencies {
120-
ktlint("com.pinterest.ktlint:ktlint-cli:1.5.0") {
120+
ktlint("com.pinterest.ktlint:ktlint-cli:1.6.0") {
121121
attributes {
122122
attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL))
123123
}
@@ -167,7 +167,7 @@ The configuration below, defines following task:
167167
val ktlint by configurations.creating
168168

169169
dependencies {
170-
ktlint("com.pinterest.ktlint:ktlint-cli:1.5.0") {
170+
ktlint("com.pinterest.ktlint:ktlint-cli:1.6.0") {
171171
attributes {
172172
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
173173
}

0 commit comments

Comments
 (0)