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

Jump to bottom

Upgraded ktlint.version from 0.44.0 to 0.45.1 #459

Merged
merged 2 commits into from
Mar 28, 2022
Merged

Upgraded ktlint.version from 0.44.0 to 0.45.1 #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e03eee6
Bump ktlint.version from 0.44.0 to 0.45.1
dependabot[bot] Mar 27, 2022
6cb0cc9
Fixed compile issue with ktlint 0.45.0
freemanjp Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/google-java-format.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<guice.version>4.2.0</guice.version>
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<kotlin.version>1.6.10</kotlin.version>
<ktlint.version>0.44.0</ktlint.version>
<ktlint.version>0.45.1</ktlint.version>
<license-maven-plugin.version>1.20</license-maven-plugin.version>
<maven.version>3.5.4</maven.version>
<mockk.version>1.9.3</mockk.version>
Expand Down
5 changes: 2 additions & 3 deletions ...lugin/ktlint/internal/MavenLogReporter.kt → ...n/maven/plugin/ktlint/MavenLogReporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@
* THE SOFTWARE.
* #L%
*/
package com.github.gantsign.maven.plugin.ktlint.internal
package com.github.gantsign.maven.plugin.ktlint

import com.pinterest.ktlint.core.LintError
import com.pinterest.ktlint.core.Reporter
import java.io.File
import java.util.ArrayList
import java.util.concurrent.ConcurrentHashMap
import org.apache.maven.plugin.logging.Log
import org.apache.maven.shared.utils.logging.MessageUtils

internal class MavenLogReporter(
class MavenLogReporter(
val log: Log,
val verbose: Boolean,
val groupByFile: Boolean,
Expand Down
8 changes: 3 additions & 5 deletions src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporterProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,18 @@
*/
package com.github.gantsign.maven.plugin.ktlint

import com.github.gantsign.maven.plugin.ktlint.internal.MavenLogReporter
import com.pinterest.ktlint.core.Reporter
import com.pinterest.ktlint.core.ReporterProvider
import java.io.PrintStream
import org.apache.maven.plugin.logging.Log

class MavenLogReporterProvider : ReporterProvider {
class MavenLogReporterProvider : ReporterProvider<MavenLogReporter> {

override val id: String = "maven"

override fun get(out: PrintStream, opt: Map<String, String>): Reporter =
override fun get(out: PrintStream, opt: Map<String, String>): MavenLogReporter =
throw UnsupportedOperationException("Use MavenLogReporterProvider.get(Log, Map<String, String>) instead.")

fun get(log: Log, opt: Map<String, String>): Reporter =
fun get(log: Log, opt: Map<String, String>): MavenLogReporter =
MavenLogReporter(
log = log,
verbose = opt["verbose"].emptyOrTrue(),
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Check.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/
package com.github.gantsign.maven.plugin.ktlint.internal

import com.github.gantsign.maven.plugin.ktlint.MavenLogReporter
import com.github.gantsign.maven.plugin.ktlint.ReporterConfig
import java.io.File
import java.nio.charset.Charset
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Sources.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down