From b10081f6b757cc019baecf1346b60cf0a51f7cc2 Mon Sep 17 00:00:00 2001 From: wakingrufus Date: Wed, 1 May 2024 08:20:15 -0500 Subject: [PATCH] update versions for testing update max gradle to 8.6 update ktlint versions to be latest patch version of each minor version supported (0.47-1.2) update max AGP version to 8.4 update max kotlin version to 1.9.23 --- CHANGELOG.md | 1 + plugin/VERSION_LATEST_RELEASE.txt | 2 +- .../jlleitschuh/gradle/ktlint/tasks/BaseKtLintCheckTask.kt | 1 + .../gradle/ktlint/KtLintSupportedVersionsTest.kt | 6 ++---- .../jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 700e9eb6..19d19877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/). with any os [#738](https://github.com/JLLeitschuh/ktlint-gradle/pull/738) - fix [#750](https://github.com/JLLeitschuh/ktlint-gradle/issues/750): additionalEditorconfig property not being accounted for up-to-date checks and caching [#758](https://github.com/JLLeitschuh/ktlint-gradle/pull/758) +- Update versions used for testing [#763](https://github.com/JLLeitschuh/ktlint-gradle/pull/763) ## [12.1.0] - 2024-01-09 diff --git a/plugin/VERSION_LATEST_RELEASE.txt b/plugin/VERSION_LATEST_RELEASE.txt index 470ce40f..77903b35 100644 --- a/plugin/VERSION_LATEST_RELEASE.txt +++ b/plugin/VERSION_LATEST_RELEASE.txt @@ -1 +1 @@ -12.0.3 +12.1.0 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 45bf6039..b5cabcff 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 @@ -53,6 +53,7 @@ abstract class BaseKtLintCheckTask @Inject constructor( internal abstract val ktLintClasspath: ConfigurableFileCollection @get:Internal + @get:Deprecated("ktlint no longer supports this parameter") internal abstract val additionalEditorconfigFile: RegularFileProperty @get:Input 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 af283e69..384c3224 100644 --- a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt +++ b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/KtLintSupportedVersionsTest.kt @@ -174,15 +174,13 @@ class KtLintSupportedVersionsTest : AbstractPluginTest() { class SupportedKtlintVersionsProvider : GradleArgumentsProvider() { private val supportedKtlintVersions = mutableListOf( "0.47.1", - "0.48.0", - "0.48.1", "0.48.2", // "0.49.0" did not expose needed baseline classes "0.49.1", "0.50.0", - "1.0.0", "1.0.1", - "1.1.0" + "1.1.1", + "1.2.1" ) override fun provideArguments( diff --git a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt index c649975b..e15cb6f8 100644 --- a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt +++ b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt @@ -12,12 +12,12 @@ import kotlin.streams.asStream @Suppress("ConstPropertyName") object TestVersions { const val minSupportedGradleVersion = KtlintBasePlugin.LOWEST_SUPPORTED_GRADLE_VERSION - const val maxSupportedGradleVersion = "8.5" + const val maxSupportedGradleVersion = "8.6" val pluginVersion = File("VERSION_CURRENT.txt").readText().trim() const val minSupportedKotlinPluginVersion = "1.4.32" - const val maxSupportedKotlinPluginVersion = "1.9.21" + const val maxSupportedKotlinPluginVersion = "1.9.23" const val minAgpVersion = "4.1.0" - const val maxAgpVersion = "8.2.0" + const val maxAgpVersion = "8.4.0" } @Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)