Skip to content

Commit bcca44a

Browse files
committed
[Gradle] Bump minimal supported Gradle version to 8.14.5
^KT-84114
1 parent 8f759fb commit bcca44a

10 files changed

Lines changed: 20 additions & 71 deletions

File tree

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ val maxParallelTestForks =
209209

210210
// Must be in sync with TestVersions.kt KTI-1612
211211
val gradleVersions = listOf(
212-
"7.4.2", // check org.jetbrains.kotlin.gradle.GradleCompatibilityIT.testIncompatibleGradleVersion
212+
"8.13", // check org.jetbrains.kotlin.gradle.GradleCompatibilityIT.testIncompatibleGradleVersion
213213
"8.14.5",
214214
"9.0.0",
215215
"9.1.0",

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ProblemsApiIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class ProblemsApiIT : KGPBaseTest() {
220220

221221
val actualProblems = problemReport.diagnostics.filter {
222222
it.problemId.all { id ->
223-
id.name != "OldNativeVersionDiagnostic" && id.name != "deprecated-gradle-version-warning"
223+
id.name != "OldNativeVersionDiagnostic"
224224
}
225225
}
226226

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface TestVersions {
1515
// https://gradle.org/nightly/
1616
// Gradle nightly releases retention policy is 3 months
1717
object Gradle {
18-
const val G_7_4 = "7.4.2"
18+
const val G_8_13 = "8.13"
1919
const val G_8_14 = "8.14.5"
2020
const val G_9_0 = "9.0.0"
2121
const val G_9_1 = "9.1.0"
@@ -29,11 +29,10 @@ interface TestVersions {
2929
/**
3030
* Check [org.jetbrains.kotlin.gradle.GradleCompatibilityIT.testIncompatibleGradleVersion]
3131
*/
32-
// TODO - KT-84114 change to Gradle 8.13
33-
const val MIN_UNSUPPORTED_VERSION_TO_CHECK = G_7_4
32+
const val MIN_UNSUPPORTED_VERSION_TO_CHECK = G_8_13
3433

3534
// Should be the same as GradleCompatibilityCheck.minSupportedGradleVersion
36-
const val MIN_SUPPORTED = G_8_14 // TODO - KT-84114: return back to MINIMALLY_SUPPORTED_GRADLE_VERSION
35+
const val MIN_SUPPORTED = MINIMALLY_SUPPORTED_GRADLE_VERSION
3736
const val MAX_SUPPORTED = G_9_7
3837
}
3938

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/diagnosticsAssertions.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ fun BuildResult.extractProjectsAndTheirDiagnosticsInBlocks(): List<String> {
140140
// Environment-dependent and expected to differ between local and CI setups.
141141
}
142142

143-
KotlinToolingDiagnostics.DeprecatedGradleVersionWarning.id in firstDiagnosticLine -> {
144-
// Generic diagnostic that has a dedicated test.
145-
}
146-
147143
KotlinToolingDiagnostics.InternalKotlinGradlePluginPropertiesUsed.id in firstDiagnosticLine -> {
148144
val cleanedDiagnostic = filterKgpUtilityPropertiesFromDiagnostic(currentDiagnostic)
149145
if (cleanedDiagnostic.isNotEmpty()) blocks += cleanedDiagnostic.joinToString(separator = "\n", postfix = "\n")

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/diagnostics/GradleCompatibilityCheck.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ import org.jetbrains.kotlin.gradle.plugin.diagnostics.reportDiagnosticOncePerBui
1313

1414

1515
internal object GradleCompatibilityCheck {
16-
internal const val minSupportedGradleVersionString = "7.6.3"
17-
internal const val nextMinimumSupportedGradleVersionString = "8.14.4"
16+
internal const val minSupportedGradleVersionString = "8.14.5"
1817

1918
private val minSupportedGradleVersion = GradleVersion.version(minSupportedGradleVersionString)
20-
private val nextMinimumSupportedGradleVersion = GradleVersion.version(nextMinimumSupportedGradleVersionString)
2119

2220
fun Project.runGradleCompatibilityCheck(
2321
gradleVersionProvider: CurrentGradleVersionProvider = DefaultCurrentGradleVersionProvider
@@ -37,13 +35,6 @@ internal object GradleCompatibilityCheck {
3735
logger.error("Failed to report Gradle version incompatibility diagnostic properly. Throwing it straight away.", e)
3836
throw KotlinDiagnosticsException(diagnostic.toString())
3937
}
40-
} else if (currentVersion < nextMinimumSupportedGradleVersion) {
41-
reportDiagnosticOncePerBuild(
42-
KotlinToolingDiagnostics.DeprecatedGradleVersionWarning(
43-
currentVersion,
44-
nextMinimumSupportedGradleVersion,
45-
)
46-
)
4738
}
4839
}
4940

@@ -54,4 +45,4 @@ internal object GradleCompatibilityCheck {
5445
internal object DefaultCurrentGradleVersionProvider : CurrentGradleVersionProvider {
5546
override fun get(): GradleVersion = GradleVersion.current()
5647
}
57-
}
48+
}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -733,28 +733,6 @@ internal object KotlinToolingDiagnostics {
733733
}
734734
}
735735

736-
object DeprecatedGradleVersionWarning : ToolingDiagnosticFactory(WARNING, DiagnosticGroup.Kgp.Deprecation) {
737-
operator fun invoke(
738-
currentGradleVersion: GradleVersion,
739-
nextMinimumSupportedGradleVersion: GradleVersion,
740-
) = build {
741-
title("Deprecated Gradle Version")
742-
.description {
743-
"""
744-
The used Gradle version ($currentGradleVersion) is deprecated and will not be supported in future Kotlin Gradle Plugin releases.
745-
The minimum supported Gradle version will become $nextMinimumSupportedGradleVersion in Kotlin 2.5.0.
746-
747-
This warning can be suppressed in 'gradle.properties':
748-
${KOTLIN_SUPPRESS_GRADLE_PLUGIN_WARNINGS_PROPERTY}=$id
749-
750-
""".trimIndent()
751-
}
752-
.solution {
753-
"Please update the Gradle version to at least $nextMinimumSupportedGradleVersion."
754-
}
755-
}
756-
}
757-
758736
object IncompatibleAgpVersionTooLowFatalError : ToolingDiagnosticFactory(FATAL, DiagnosticGroup.Kgp.Misconfiguration) {
759737
operator fun invoke(
760738
androidGradlePluginVersionString: String,

libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/checkers/GradleCompatibilityCheckTest.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ class GradleCompatibilityCheckTest {
2222
gradle.registerMinimalVariantImplementationFactoriesForTests()
2323
}
2424

25-
private val unsupportedGradleVersion = FixedAndroidGradlePluginVersionProvider("7.5.1")
26-
private val deprecatedGradleVersion = FixedAndroidGradlePluginVersionProvider("8.13")
25+
private val unsupportedGradleVersion = FixedAndroidGradlePluginVersionProvider("8.13")
2726
private val supportedGradleVersion = FixedAndroidGradlePluginVersionProvider(
28-
GradleCompatibilityCheck.nextMinimumSupportedGradleVersionString
27+
GradleCompatibilityCheck.minSupportedGradleVersionString
2928
)
3029

3130
@Test
@@ -38,12 +37,6 @@ class GradleCompatibilityCheckTest {
3837
genericProject.checkDiagnostics("checkers/gradleCompatibilityCheck/versionTooLow")
3938
}
4039

41-
@Test
42-
fun testVersionIsDeprecated() {
43-
genericProject.runGradleCompatibilityCheck(deprecatedGradleVersion)
44-
genericProject.checkDiagnostics("checkers/gradleCompatibilityCheck/versionDeprecated")
45-
}
46-
4740
@Test
4841
fun testVersionAboveDeprecatedRange() {
4942
genericProject.runGradleCompatibilityCheck(supportedGradleVersion)
@@ -61,4 +54,4 @@ class GradleCompatibilityCheckTest {
6154
) : GradleCompatibilityCheck.CurrentGradleVersionProvider {
6255
override fun get(): GradleVersion = GradleVersion.version(version)
6356
}
64-
}
57+
}

libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/checkers/gradleCompatibilityCheck/versionDeprecated.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[IncompatibleGradleVersionTooLowFatalError | FATAL] Gradle Version Incompatible with Kotlin Gradle Plugin
22
Kotlin Gradle Plugin <-> Gradle compatibility issue:
3-
The applied Kotlin Gradle is not compatible with the used Gradle version (Gradle 7.5.1).
4-
Please update the Gradle version to at least Gradle 7.6.3.
3+
The applied Kotlin Gradle is not compatible with the used Gradle version (Gradle 8.13).
4+
Please update the Gradle version to at least Gradle 8.14.5.

repo/testLifecycleTask.dump.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ Not connected to any 'lifecycleTestTask':
433433
- :kotlin-compiler-native-image:test [Unknown]
434434
- :kotlin-daemon-client:test [BuildToolsApi]
435435
- :kotlin-gradle-plugin-integration-tests:kgpAllParallelTests [Gradle]
436-
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_7_4_2 [Gradle]
436+
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_8_13 [Gradle]
437437
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_8_14_5 [Gradle]
438438
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_9_0_0 [Gradle]
439439
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_9_1_0 [Gradle]
@@ -443,7 +443,7 @@ Not connected to any 'lifecycleTestTask':
443443
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_9_5_1 [Gradle]
444444
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_9_6_1 [Gradle]
445445
- :kotlin-gradle-plugin-integration-tests:kgpAndroidTestsForGradle_9_7_0 [Gradle]
446-
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_7_4_2 [Gradle]
446+
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_8_13 [Gradle]
447447
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_8_14_5 [Gradle]
448448
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_9_0_0 [Gradle]
449449
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_9_1_0 [Gradle]
@@ -453,7 +453,7 @@ Not connected to any 'lifecycleTestTask':
453453
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_9_5_1 [Gradle]
454454
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_9_6_1 [Gradle]
455455
- :kotlin-gradle-plugin-integration-tests:kgpDaemonsTestsForGradle_9_7_0 [Gradle]
456-
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_7_4_2 [Gradle]
456+
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_8_13 [Gradle]
457457
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_8_14_5 [Gradle]
458458
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_9_0_0 [Gradle]
459459
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_9_1_0 [Gradle]
@@ -463,7 +463,7 @@ Not connected to any 'lifecycleTestTask':
463463
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_9_5_1 [Gradle]
464464
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_9_6_1 [Gradle]
465465
- :kotlin-gradle-plugin-integration-tests:kgpJsBrowserTestsForGradle_9_7_0 [Gradle]
466-
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_7_4_2 [Gradle]
466+
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_8_13 [Gradle]
467467
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_8_14_5 [Gradle]
468468
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_9_0_0 [Gradle]
469469
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_9_1_0 [Gradle]
@@ -473,7 +473,7 @@ Not connected to any 'lifecycleTestTask':
473473
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_9_5_1 [Gradle]
474474
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_9_6_1 [Gradle]
475475
- :kotlin-gradle-plugin-integration-tests:kgpJsTestsForGradle_9_7_0 [Gradle]
476-
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_7_4_2 [Gradle]
476+
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_8_13 [Gradle]
477477
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_8_14_5 [Gradle]
478478
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_9_0_0 [Gradle]
479479
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_9_1_0 [Gradle]
@@ -483,7 +483,7 @@ Not connected to any 'lifecycleTestTask':
483483
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_9_5_1 [Gradle]
484484
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_9_6_1 [Gradle]
485485
- :kotlin-gradle-plugin-integration-tests:kgpJvmTestsForGradle_9_7_0 [Gradle]
486-
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_7_4_2 [Gradle]
486+
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_8_13 [Gradle]
487487
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_8_14_5 [Gradle]
488488
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_9_0_0 [Gradle]
489489
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_9_1_0 [Gradle]
@@ -493,7 +493,7 @@ Not connected to any 'lifecycleTestTask':
493493
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_9_5_1 [Gradle]
494494
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_9_6_1 [Gradle]
495495
- :kotlin-gradle-plugin-integration-tests:kgpMppTestsForGradle_9_7_0 [Gradle]
496-
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_7_4_2 [Gradle]
496+
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_8_13 [Gradle]
497497
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_8_14_5 [Gradle]
498498
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_9_0_0 [Gradle]
499499
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_9_1_0 [Gradle]
@@ -503,7 +503,7 @@ Not connected to any 'lifecycleTestTask':
503503
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_9_5_1 [Gradle]
504504
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_9_6_1 [Gradle]
505505
- :kotlin-gradle-plugin-integration-tests:kgpNativeTestsForGradle_9_7_0 [Gradle]
506-
- :kotlin-gradle-plugin-integration-tests:kgpOtherTestsForGradle_7_4_2 [Gradle]
506+
- :kotlin-gradle-plugin-integration-tests:kgpOtherTestsForGradle_8_13 [Gradle]
507507
- :kotlin-gradle-plugin-integration-tests:kgpOtherTestsForGradle_8_14_5 [Gradle]
508508
- :kotlin-gradle-plugin-integration-tests:kgpOtherTestsForGradle_9_0_0 [Gradle]
509509
- :kotlin-gradle-plugin-integration-tests:kgpOtherTestsForGradle_9_1_0 [Gradle]

0 commit comments

Comments
 (0)