Skip to content

Commit

Permalink
Upgraded Ktlint to 1.1.1 (#580)
Browse files Browse the repository at this point in the history
Kotlin 1.9.22 + Ktlint 1.1.1

Fix FormatMojoTest
---------
Co-authored-by: John Freeman <john.freeman.opensource@gmail.com>
  • Loading branch information
Goooler committed Mar 3, 2024
1 parent b83069f commit 90c7da9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
21 changes: 19 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<java.require.version>11</java.require.version>
<jdeps.multiRelease>11</jdeps.multiRelease>
<kotlin.version>1.9.10</kotlin.version>
<ktlint.version>1.0.0</ktlint.version>
<kotlin.version>1.9.22</kotlin.version>
<ktlint.version>1.1.1</ktlint.version>
<license-maven-plugin.version>1.20</license-maven-plugin.version>
<maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
<maven.compiler.release>8</maven.compiler.release>
Expand Down Expand Up @@ -540,6 +540,23 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>analyze-dependencies</id>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<ignoredUnusedDeclaredDependencies combine.children="append">
<dependency>com.pinterest.ktlint:ktlint-cli-reporter-plain</dependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class FormatMojoTest {
}
verify { log.debug("Format fixed > $source:30:8: Missing newline before \")\"") }
verify { log.debug("Format fixed > $source:30:8: Missing trailing comma before \")\"") }
verify { log.debug("Format could not fix > $source:29:14: Exceeded max line length (80)") }
verify { log.debug("Format could not fix > $source:29:94: Exceeded max line length (80)") }
verify { log.debug("Format fixed > $source") }
verify { log.warn("Source root doesn't exist: $testRoot") }
verify { log.info("1 file(s) formatted.") }
Expand Down Expand Up @@ -106,7 +106,7 @@ class FormatMojoTest {
)
}
verify { log.debug("Format fixed > $scriptSource:30:8: Missing newline before \")\"") }
verify { log.debug("Format could not fix > $scriptSource:29:14: Exceeded max line length (80)") }
verify { log.debug("Format could not fix > $scriptSource:29:94: Exceeded max line length (80)") }
verify { log.debug("Format fixed > $scriptSource") }
verify { log.warn("Source root doesn't exist: $testRoot") }
verify { log.info("1 file(s) formatted.") }
Expand Down

0 comments on commit 90c7da9

Please sign in to comment.