diff --git a/CHANGELOG.md b/CHANGELOG.md index d5cc0747..fd1baaee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/). - ? ### Changed - Updated Gradle to `6.8.3` version + - Updated default KtLint version to `0.41.0` ### Fixed - Plugin fails to apply on non-Kotlin projects ([#443](https://github.com/JLLeitschuh/ktlint-gradle/issues/443)) ### Removed diff --git a/plugin/buildSrc/src/main/kotlin/PluginDependencies.kt b/plugin/buildSrc/src/main/kotlin/PluginDependencies.kt index a13b28ac..f94615ce 100644 --- a/plugin/buildSrc/src/main/kotlin/PluginDependencies.kt +++ b/plugin/buildSrc/src/main/kotlin/PluginDependencies.kt @@ -1,7 +1,7 @@ object PluginVersions { val kotlin = "1.4.30" val ktlintPlugin = "9.3.0" - val ktlint = "0.40.0" + val ktlint = "0.41.0" val gradlePublishPlugin = "0.12.0" val androidPlugin = "4.1.0" val semver = "1.1.1" diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/Configurations.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/Configurations.kt index bf63ca26..5ebde605 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/Configurations.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/Configurations.kt @@ -3,11 +3,11 @@ package org.jlleitschuh.gradle.ktlint import net.swiftzer.semver.SemVer import org.gradle.api.Project import org.gradle.api.artifacts.Configuration -import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ModuleComponentSelector import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.artifacts.result.ResolvedDependencyResult +import org.gradle.api.attributes.Bundling import org.gradle.util.GradleVersion internal const val KTLINT_CONFIGURATION_NAME = "ktlint" @@ -23,16 +23,16 @@ internal fun createKtlintConfiguration(target: Project, extension: KtlintExtensi if (state != Configuration.State.UNRESOLVED) return@apply description = KTLINT_CONFIGURATION_DESCRIPTION - val dependencyProvider = target.provider { + + // Starting from KtLint 0.41.0 version published artifact has two variants: "external" and "shadowed" + attributes { + it.attribute(Bundling.BUNDLING_ATTRIBUTE, target.objects.named(Bundling::class.java, Bundling.EXTERNAL)) + } + + val dependencyProvider = target.provider { val ktlintVersion = extension.version.get() target.logger.info("Add dependency: ktlint version $ktlintVersion") - target.dependencies.create( - mapOf( - "group" to resolveGroup(ktlintVersion), - "name" to "ktlint", - "version" to ktlintVersion - ) - ) + target.dependencies.create("${resolveGroup(ktlintVersion)}:ktlint:$ktlintVersion") } dependencies.addLater(dependencyProvider) } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintExtension.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintExtension.kt index d258a429..609a24b3 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintExtension.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintExtension.kt @@ -31,9 +31,9 @@ internal constructor( ) /** - * The version of ktlint to use. + * The version of KtLint to use. */ - val version: Property = objectFactory.property { set("0.40.0") } + val version: Property = objectFactory.property { set("0.41.0") } /** * Enable verbose mode. diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/TaskCreation.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/TaskCreation.kt index 82ded905..a3edf01e 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/TaskCreation.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/TaskCreation.kt @@ -158,4 +158,5 @@ private fun GenerateReportsTask.commonConfiguration( outputColorName.set(pluginHolder.extension.outputColorName) ignoreFailures.set(pluginHolder.extension.ignoreFailures) verbose.set(pluginHolder.extension.verbose) + ktLintVersion.set(pluginHolder.extension.version) } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/BaseKtLintCheckTask.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/BaseKtLintCheckTask.kt index 695dee82..59f73b3f 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/BaseKtLintCheckTask.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/BaseKtLintCheckTask.kt @@ -140,6 +140,7 @@ abstract class BaseKtLintCheckTask @Inject constructor( params.additionalEditorconfigFile.set(additionalEditorconfigFile) params.formatSource.set(formatSources) params.discoveredErrorsFile.set(discoveredErrors) + params.ktLintVersion.set(ktLintVersion) } } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/GenerateReportsTask.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/GenerateReportsTask.kt index a399660b..40122749 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/GenerateReportsTask.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/GenerateReportsTask.kt @@ -76,6 +76,9 @@ abstract class GenerateReportsTask @Inject constructor( @get:Input internal abstract val verbose: Property + @get:Input + internal abstract val ktLintVersion: Property + init { // Workaround for https://github.com/gradle/gradle/issues/2919 onlyIf { @@ -122,6 +125,7 @@ abstract class GenerateReportsTask @Inject constructor( param.reporterId.set(loadedReporter.reporterId) param.reporterOutput.set(reporterOutput) param.reporterOptions.set(generateReporterOptions(loadedReporter)) + param.ktLintVersion.set(ktLintVersion) } } @@ -131,6 +135,7 @@ abstract class GenerateReportsTask @Inject constructor( param.ignoreFailures.set(ignoreFailures) param.verbose.set(verbose) param.generatedReportsPaths.from(loadedReporters.values) + param.ktLintVersion.set(ktLintVersion) } } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/LoadReportersTask.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/LoadReportersTask.kt index c465df04..2cf7c9d0 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/LoadReportersTask.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/tasks/LoadReportersTask.kt @@ -78,6 +78,7 @@ internal abstract class LoadReportersTask @Inject constructor( param.customReporters.set(customReporters) param.loadedReporters.set(loadedReporters) param.loadedReporterProviders.set(loadedReporterProviders) + param.ktLintVersion.set(ktLintVersion) } } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/ConsoleReportWorkAction.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/ConsoleReportWorkAction.kt index 97b49fe4..23f4099e 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/ConsoleReportWorkAction.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/ConsoleReportWorkAction.kt @@ -1,6 +1,7 @@ package org.jlleitschuh.gradle.ktlint.worker import com.pinterest.ktlint.core.LintError +import net.swiftzer.semver.SemVer import org.gradle.api.GradleException import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.RegularFileProperty @@ -16,7 +17,13 @@ internal abstract class ConsoleReportWorkAction : WorkAction val verbose: Property val generatedReportsPaths: ConfigurableFileCollection + val ktLintVersion: Property } } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/Deserializers.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/Deserializers.kt deleted file mode 100644 index a3fc2121..00000000 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/Deserializers.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.jlleitschuh.gradle.ktlint.worker - -import com.pinterest.ktlint.core.ReporterProvider -import org.apache.commons.io.serialization.ValidatingObjectInputStream -import java.io.BufferedInputStream -import java.io.File -import java.io.FileInputStream - -internal fun loadErrors( - serializedErrors: File -): List = ValidatingObjectInputStream( - BufferedInputStream( - FileInputStream(serializedErrors) - ) -) - .use { - it.accept( - ArrayList::class.java, - LintErrorResult::class.java, - File::class.java, - Pair::class.java, - SerializableLintError::class.java, - java.lang.Boolean::class.java - ) - it.accept("kotlin.Pair") - @Suppress("UNCHECKED_CAST") - it.readObject() as List - } - -internal fun loadReporterProviders( - serializedReporterProviders: File -): List = ValidatingObjectInputStream( - BufferedInputStream( - FileInputStream(serializedReporterProviders) - ) -) - .use { - it.accept( - ArrayList::class.java, - SerializableReporterProvider::class.java - ) - @Suppress("UNCHECKED_CAST") - it.readObject() as List - } - .map { it.reporterProvider } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/GenerateReportsWorkAction.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/GenerateReportsWorkAction.kt index 2d0c609f..d81e040a 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/GenerateReportsWorkAction.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/GenerateReportsWorkAction.kt @@ -1,5 +1,6 @@ package org.jlleitschuh.gradle.ktlint.worker +import net.swiftzer.semver.SemVer import org.gradle.api.GradleException import org.gradle.api.file.RegularFileProperty import org.gradle.api.provider.MapProperty @@ -12,9 +13,17 @@ import java.io.PrintStream internal abstract class GenerateReportsWorkAction : WorkAction { override fun execute() { - val discoveredErrors = loadErrors(parameters.discoveredErrorsFile.get().asFile) + val ktLintClassesSerializer = KtLintClassesSerializer + .create( + SemVer.parse(parameters.ktLintVersion.get()) + ) + + val discoveredErrors = ktLintClassesSerializer.loadErrors(parameters.discoveredErrorsFile.get().asFile) val currentReporterId = parameters.reporterId.get() - val reporterProvider = loadReporterProviders(parameters.loadedReporterProviders.asFile.get()) + val reporterProvider = ktLintClassesSerializer + .loadReporterProviders( + parameters.loadedReporterProviders.asFile.get() + ) .find { it.id == currentReporterId } ?: throw GradleException("Could not find ReporterProvider \"$currentReporterId\"") @@ -31,7 +40,7 @@ internal abstract class GenerateReportsWorkAction : WorkAction val reporterOutput: RegularFileProperty val reporterOptions: MapProperty + val ktLintVersion: Property } } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintClassesSerializer.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintClassesSerializer.kt new file mode 100644 index 00000000..b10a4700 --- /dev/null +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintClassesSerializer.kt @@ -0,0 +1,196 @@ +package org.jlleitschuh.gradle.ktlint.worker + +import com.pinterest.ktlint.core.LintError +import com.pinterest.ktlint.core.ReporterProvider +import net.swiftzer.semver.SemVer +import org.apache.commons.io.serialization.ValidatingObjectInputStream +import java.io.BufferedInputStream +import java.io.BufferedOutputStream +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.ObjectInputStream +import java.io.ObjectOutputStream +import java.io.Serializable + +internal interface KtLintClassesSerializer { + fun saveErrors( + lintErrors: List, + serializedErrors: File + ) + + fun loadErrors( + serializedErrors: File + ): List + + fun saveReporterProviders( + reporterProviders: List, + serializedReporterProviders: File + ) + + fun loadReporterProviders( + serializedReporterProviders: File + ): List + + companion object { + fun create(ktLintVersion: SemVer): KtLintClassesSerializer = + if (ktLintVersion >= SemVer(0, 41, 0)) { + CurrentKtLintClassesSerializer() + } else { + OldKtLintClassesSerializer() + } + } +} + +/** + * Should be used for KtLint '0.41.0'+ versions. + */ +private class CurrentKtLintClassesSerializer : KtLintClassesSerializer { + override fun saveErrors( + lintErrors: List, + serializedErrors: File + ) = ObjectOutputStream( + BufferedOutputStream( + FileOutputStream( + serializedErrors + ) + ) + ).use { + it.writeObject(lintErrors) + } + + override fun loadErrors(serializedErrors: File): List = ValidatingObjectInputStream( + BufferedInputStream( + FileInputStream(serializedErrors) + ) + ) + .use { + it.accept( + ArrayList::class.java, + LintErrorResult::class.java, + File::class.java, + Pair::class.java, + LintError::class.java, + java.lang.Boolean::class.java + ) + it.accept("kotlin.Pair") + @Suppress("UNCHECKED_CAST") + it.readObject() as List + } + + override fun saveReporterProviders( + reporterProviders: List, + serializedReporterProviders: File + ) = ObjectOutputStream( + BufferedOutputStream( + FileOutputStream( + serializedReporterProviders + ) + ) + ).use { oos -> + oos.writeObject( + reporterProviders + ) + } + + override fun loadReporterProviders( + serializedReporterProviders: File + ): List = ObjectInputStream( + BufferedInputStream( + FileInputStream(serializedReporterProviders) + ) + ) + .use { + @Suppress("UNCHECKED_CAST") + it.readObject() as List + } +} + +/** + * Should be used for pre '0.41.0' version when required KtLint classes does not implement [Serializable]. + */ +private class OldKtLintClassesSerializer : KtLintClassesSerializer { + override fun saveErrors( + lintErrors: List, + serializedErrors: File + ) = ObjectOutputStream( + BufferedOutputStream( + FileOutputStream( + serializedErrors + ) + ) + ).use { + it.writeObject(lintErrors.map(LintErrorResultCompat::from)) + } + + override fun loadErrors( + serializedErrors: File + ): List = ValidatingObjectInputStream( + BufferedInputStream( + FileInputStream(serializedErrors) + ) + ) + .use { + it.accept( + ArrayList::class.java, + LintErrorResultCompat::class.java, + File::class.java, + Pair::class.java, + SerializableLintError::class.java, + java.lang.Boolean::class.java + ) + it.accept("kotlin.Pair") + @Suppress("UNCHECKED_CAST") + (it.readObject() as List).map(LintErrorResultCompat::to) + } + + override fun saveReporterProviders( + reporterProviders: List, + serializedReporterProviders: File + ) = ObjectOutputStream( + BufferedOutputStream( + FileOutputStream( + serializedReporterProviders + ) + ) + ).use { oos -> + oos.writeObject( + reporterProviders.map(::SerializableReporterProvider) + ) + } + + override fun loadReporterProviders( + serializedReporterProviders: File + ): List = ValidatingObjectInputStream( + BufferedInputStream( + FileInputStream(serializedReporterProviders) + ) + ) + .use { + it.accept( + ArrayList::class.java, + SerializableReporterProvider::class.java + ) + @Suppress("UNCHECKED_CAST") + it.readObject() as List + } + .map { it.reporterProvider } + + private data class LintErrorResultCompat( + val lintedFile: File, + val lintErrors: List> + ) : Serializable { + fun to(): LintErrorResult = LintErrorResult( + lintedFile, + lintErrors.map { Pair(it.first.lintError, it.second) } + ) + companion object { + fun from( + lintError: LintErrorResult + ): LintErrorResultCompat = LintErrorResultCompat( + lintError.lintedFile, + lintError.lintErrors.map { Pair(SerializableLintError(it.first), it.second) } + ) + } + } +} diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintWorkAction.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintWorkAction.kt index c463f4d1..5d3d6f15 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintWorkAction.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintWorkAction.kt @@ -1,17 +1,16 @@ package org.jlleitschuh.gradle.ktlint.worker import com.pinterest.ktlint.core.KtLint +import com.pinterest.ktlint.core.LintError import com.pinterest.ktlint.core.RuleSet import com.pinterest.ktlint.core.RuleSetProvider +import net.swiftzer.semver.SemVer import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.RegularFileProperty import org.gradle.api.provider.Property import org.gradle.api.provider.SetProperty import org.gradle.workers.WorkAction import org.gradle.workers.WorkParameters -import java.io.BufferedOutputStream -import java.io.FileOutputStream -import java.io.ObjectOutputStream import java.util.ServiceLoader @Suppress("UnstableApiUsage") @@ -34,7 +33,7 @@ abstract class KtLintWorkAction : WorkAction() parameters.filesToLint.files.forEach { - val errors = mutableListOf>() + val errors = mutableListOf>() val ktLintParameters = KtLint.Params( fileName = it.absolutePath, text = it.readText(), @@ -44,7 +43,7 @@ abstract class KtLintWorkAction : WorkAction - errors.add(SerializableLintError(lintError) to isCorrected) + errors.add(lintError to isCorrected) } ) @@ -66,15 +65,14 @@ abstract class KtLintWorkAction : WorkAction { @@ -117,5 +115,6 @@ abstract class KtLintWorkAction : WorkAction val discoveredErrorsFile: RegularFileProperty + val ktLintVersion: Property } } diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LintErrorResult.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LintErrorResult.kt index 594baaf4..9c2f0d5f 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LintErrorResult.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LintErrorResult.kt @@ -1,5 +1,6 @@ package org.jlleitschuh.gradle.ktlint.worker +import com.pinterest.ktlint.core.LintError import java.io.File import java.io.Serializable @@ -11,7 +12,7 @@ import java.io.Serializable */ internal data class LintErrorResult( val lintedFile: File, - val lintErrors: List> + val lintErrors: List> ) : Serializable { companion object { private const val serialVersionUID: Long = 2012012585L diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LoadReportersWorkAction.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LoadReportersWorkAction.kt index bb5a7fad..845dcacf 100644 --- a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LoadReportersWorkAction.kt +++ b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/worker/LoadReportersWorkAction.kt @@ -1,6 +1,7 @@ package org.jlleitschuh.gradle.ktlint.worker import com.pinterest.ktlint.core.ReporterProvider +import net.swiftzer.semver.SemVer import org.gradle.api.GradleException import org.gradle.api.file.RegularFileProperty import org.gradle.api.logging.Logging @@ -26,17 +27,13 @@ internal abstract class LoadReportersWorkAction : WorkAction - oos.writeObject( - loadedReporters.map { SerializableReporterProvider(it.second) } - ) - } + val ktLintClassesSerializer = KtLintClassesSerializer.create( + SemVer.parse(parameters.ktLintVersion.get()) + ) + ktLintClassesSerializer.saveReporterProviders( + loadedReporters.map { it.second }, + parameters.loadedReporterProviders.asFile.get() + ) ObjectOutputStream( BufferedOutputStream( @@ -122,6 +119,7 @@ internal abstract class LoadReportersWorkAction : WorkAction val loadedReporterProviders: RegularFileProperty val loadedReporters: RegularFileProperty + val ktLintVersion: Property } internal data class LoadedReporter( diff --git a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt index c185d1e8..71f48dc5 100644 --- a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt +++ b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt @@ -3,6 +3,7 @@ package org.jlleitschuh.gradle.ktlint import org.assertj.core.api.Assertions.assertThat import org.gradle.testkit.runner.TaskOutcome import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.OS import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -16,7 +17,8 @@ class KtLintSupportedVersionsTest : AbstractPluginTest() { projectRoot.defaultProjectSetup() } - @ParameterizedTest + @DisplayName("Should lint correct sources without errors") + @ParameterizedTest(name = "KtLint {0}: {displayName}") @MethodSource("provideSupportedKtLintVersions") internal fun `Should lint correct sources without errors`( ktLintVersion: String @@ -35,7 +37,8 @@ class KtLintSupportedVersionsTest : AbstractPluginTest() { } } - @ParameterizedTest + @DisplayName("Lint should fail on sources with style violations") + @ParameterizedTest(name = "KtLint {0}: {displayName}") @MethodSource("provideSupportedKtLintVersions") internal fun `Lint should fail on sources with style violations`( ktLintVersion: String @@ -54,7 +57,8 @@ class KtLintSupportedVersionsTest : AbstractPluginTest() { } } - @ParameterizedTest + @DisplayName("Format should successfully finish on sources with style violations") + @ParameterizedTest(name = "KtLint {0}: {displayName}") @MethodSource("provideSupportedKtLintVersions") internal fun `Format should successfully finish on sources with style violations`( ktLintVersion: String @@ -87,7 +91,8 @@ class KtLintSupportedVersionsTest : AbstractPluginTest() { // "0.38.0" has been compiled with Kotlin apiLevel 1.4 and not supported by Gradle plugins Arguments.of("0.38.1"), Arguments.of("0.39.0"), - Arguments.of("0.40.0") + Arguments.of("0.40.0"), + Arguments.of("0.41.0") ) // "0.37.0" is failing on Windows machines that is fixed in the next version diff --git a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPluginTest.kt b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPluginTest.kt index c50b437b..7c821023 100644 --- a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPluginTest.kt +++ b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPluginTest.kt @@ -456,7 +456,7 @@ abstract class BaseKtlintPluginTest : AbstractPluginTest() { ) build(":dependencies", "--configuration", KTLINT_RULESET_CONFIGURATION_NAME).apply { - assertThat(output).contains("com.pinterest.ktlint:ktlint-core:0.34.2 -> 0.40.0") + assertThat(output).contains("com.pinterest.ktlint:ktlint-core:0.34.2 -> 0.41.0") } } @@ -474,7 +474,7 @@ abstract class BaseKtlintPluginTest : AbstractPluginTest() { ) build(":dependencies", "--configuration", KTLINT_REPORTER_CONFIGURATION_NAME).apply { - assertThat(output).contains("com.pinterest.ktlint:ktlint-core:0.34.2 -> 0.40.0") + assertThat(output).contains("com.pinterest.ktlint:ktlint-core:0.34.2 -> 0.41.0") } } }