MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gradle][tests][compatibility][IDEA-368384] do not use Gradle 4.6 to run tests

Browse Source 
GitOrigin-RevId: 2e930679097e13086523f274f8f920181baea4d3
This commit is contained in:
Alexander.Glukhov
2025-12-02 19:51:53 +00:00
committed by intellij-monorepo-bot
parent 100872aef8
commit de22af3e8c
10 changed files with 20 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/testSources/importing/AnnotationProcessorConfigImportingTest.kt
-7
View File
@@ -22,7 +22,6 @@ import org.junit.Test
class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
@Test
@TargetVersions("4.6+")
fun `test annotation processor config imported in module per project mode`() {
currentExternalProjectSettings.isResolveModulePerSourceSet = false
@@ -56,7 +55,6 @@ class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
}
@Test
@TargetVersions("4.6+")
fun `test annotation processor modification in module per project mode`() {
currentExternalProjectSettings.isResolveModulePerSourceSet = false
@@ -98,7 +96,6 @@ class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
}
@Test
@TargetVersions("4.6+")
fun `test annotation processor config imported in modules per source set mode`() {
importProject {
withJavaPlugin()
@@ -123,7 +120,6 @@ class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
}
@Test
@TargetVersions("4.6+")
fun `test annotation processor config imported correctly for multimodule project`() {
createProjectSubFile("settings.gradle", including("projectA", "projectB"))
@@ -204,7 +200,6 @@ class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
}
@Test
@TargetVersions("4.6+")
fun `test two different annotation processors`() {
createProjectSubFile("settings.gradle", including("project1", "project2"))
@@ -242,7 +237,6 @@ class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
}
@Test
@TargetVersions("4.6+")
fun `test change modules included in processor profile`() {
createProjectSubFile("settings.gradle", including("project1", "project2"))
importProject {
@@ -281,7 +275,6 @@ class AnnotationProcessorConfigImportingTest: GradleImportingTestCase() {
}
@Test
@TargetVersions("4.6+")
fun `test annotation processor with transitive deps`() {
importProject {
withJavaPlugin()
plugins/gradle/java/testSources/testFramework/GradleTestExecutionTestCase.kt
-2
View File
@@ -4,7 +4,6 @@ package org.jetbrains.plugins.gradle.testFramework
import org.gradle.util.GradleVersion
import org.jetbrains.plugins.gradle.frameworkSupport.buildscript.isJunit5Supported
import org.jetbrains.plugins.gradle.testFramework.util.assumeThatJunit5IsSupported
import org.jetbrains.plugins.gradle.testFramework.util.assumeThatRobolectricIsSupported
import org.jetbrains.plugins.gradle.testFramework.util.assumeThatSpockIsSupported
import org.jetbrains.plugins.gradle.testFramework.util.withBuildFile
import org.jetbrains.plugins.gradle.testFramework.util.withSettingsFile
@@ -59,7 +58,6 @@ abstract class GradleTestExecutionTestCase : GradleTestExecutionBaseTestCase() {
}
fun testRobolectricProject(gradleVersion: GradleVersion, action: () -> Unit) {
assumeThatRobolectricIsSupported(gradleVersion)
test(gradleVersion, JAVA_ROBOLECTRIC_FIXTURE, action)
}
plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/GradleBuildScriptBuilderUtil.kt
-4
View File
@@ -95,10 +95,6 @@ fun isSpockSupported(gradleVersion: GradleVersion): Boolean {
return GradleVersionUtil.isGradleAtLeast(gradleVersion, "5.6")
}
fun isRobolectricSupported(gradleVersion: GradleVersion): Boolean {
return GradleVersionUtil.isGradleAtLeast(gradleVersion, "4.6")
}
fun isTopLevelJavaConventionsSupported(gradleVersion: GradleVersion): Boolean {
return GradleVersionUtil.isGradleOlderThan(gradleVersion, "8.2")
}
plugins/gradle/testSources/org/jetbrains/plugins/gradle/frameworkSupport/GradleBuildScriptBuilderTest.kt
+3 -3
View File
@@ -440,7 +440,7 @@ class GradleBuildScriptBuilderTest : GradleBuildScriptBuilderTestCase() {
|tasks.register("myTask")
""".trimMargin()),
GradleVersion.version("4.5") to ("""
GradleVersion.version("4.6") to ("""
|tasks.create 'myTask'
""".trimMargin() to """
|tasks.create("myTask")
@@ -459,7 +459,7 @@ class GradleBuildScriptBuilderTest : GradleBuildScriptBuilderTestCase() {
|tasks.register<MyTask>("myTask")
""".trimMargin()),
GradleVersion.version("4.5") to ("""
GradleVersion.version("4.6") to ("""
|tasks.create 'myTask', MyTask
""".trimMargin() to """
|tasks.create("myTask", MyTask::class.java)
@@ -484,7 +484,7 @@ class GradleBuildScriptBuilderTest : GradleBuildScriptBuilderTestCase() {
|}
""".trimMargin()),
GradleVersion.version("4.5") to ("""
GradleVersion.version("4.6") to ("""
|tasks.create('myTask', MyTask) {
| myConfiguration()
|}
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
-1
View File
@@ -1995,7 +1995,6 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
}
@Test
@TargetVersions("4.6+")
public void testAnnotationProcessorDependencies() throws Exception {
var lombok = "org.projectlombok:lombok:1.16.2";
importProject(script(it -> {
plugins/gradle/testSources/org/jetbrains/plugins/gradle/testFramework/util/GradleVersionAssumptionUtil.kt
-6
View File
@@ -57,12 +57,6 @@ fun assumeThatSpockIsSupported(gradleVersion: GradleVersion) {
}
}
fun assumeThatRobolectricIsSupported(gradleVersion: GradleVersion) {
Assumptions.assumeTrue(isRobolectricSupported(gradleVersion)) {
"Gradle ${gradleVersion.version} doesn't support Robolectric."
}
}
fun assumeThatTopLevelJavaConventionsIsSupported(gradleVersion: GradleVersion) {
Assumptions.assumeTrue(isTopLevelJavaConventionsSupported(gradleVersion)) {
"Gradle ${gradleVersion.version} doesn't support top-level java conventions."
plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/GradleJvmSupportMatricesTest.kt
+5 -5
View File
@@ -159,10 +159,10 @@ class GradleJvmSupportMatricesTest : GradleJvmSupportMatricesTestCase() {
}
fun `test suggesting oldest compatible gradle version for java version`() {
assertEquals("4.5", suggestOldestSupportedGradleVersion(6))
assertEquals("4.5", suggestOldestSupportedGradleVersion(7))
assertEquals("4.5", suggestOldestSupportedGradleVersion(8))
assertEquals("4.5", suggestOldestSupportedGradleVersion(9))
assertEquals("4.6", suggestOldestSupportedGradleVersion(6))
assertEquals("4.6", suggestOldestSupportedGradleVersion(7))
assertEquals("4.6", suggestOldestSupportedGradleVersion(8))
assertEquals("4.6", suggestOldestSupportedGradleVersion(9))
assertEquals("4.7", suggestOldestSupportedGradleVersion(10))
assertEquals("5.0", suggestOldestSupportedGradleVersion(11))
assertEquals("5.4", suggestOldestSupportedGradleVersion(12))
@@ -202,7 +202,7 @@ class GradleJvmSupportMatricesTest : GradleJvmSupportMatricesTestCase() {
}
fun `test Gradle version format`() {
assertSupportedGradleVersion("4.5") { minOrNull() }
assertSupportedGradleVersion("4.6") { minOrNull() }
assertSupportedGradleVersion("4.10.3") { maxOrNull() }
assertSupportedGradleVersion("5.0") { minOrNull() }
assertSupportedGradleVersion("5.6.2") { maxOrNull() }
plugins/gradle/tooling-extension-impl/testResources/gradle.versions.list
+1 -1
View File
@@ -1,6 +1,6 @@
# Used to prefetch Gradle versions to TeamCity build agents
# Keep in sync with org.jetbrains.plugins.gradle.tooling.VersionMatcherRule.SUPPORTED_GRADLE_VERSIONS
4.5.1
4.6
4.10.3
5.0
5.6.2
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/VersionMatcherRule.java
+2 -2
View File
@@ -27,8 +27,8 @@ public class VersionMatcherRule extends TestWatcher {
* - "gradle.versions.list" file in the resources<br/>
*/
public static final String[] SUPPORTED_GRADLE_VERSIONS = {
"4.5.1", /*"4.6", "4.7", "4.8", "4.9",*/ "4.10.3",
"5.0", /*"5.1", "5.2", "5.3.1", "5.4.1", "5.5.1",*/ "5.6.2",
"4.6", /* "4.7", "4.8", "4.9",*/ "4.10.3",
"5.0", /* "5.1", "5.2", "5.3.1", "5.4.1", "5.5.1",*/ "5.6.2",
"6.0", /* "6.0.1", "6.1", "6.2", "6.3", "6.4", "6.8.3",*/ "6.9",
"7.0.2", /* "7.1", "7.2", "7.4", "7.5.1",*/ "7.6",
"8.0", /*"8.2", "8.3", "8.4", "8.5", "8.6", "8.7", "8.8", "8.9", "8.10", "8.11", "8.12", "8.13",*/ "8.14.1",
plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinCoroutineDebugGradleTaskManagerExtension.kt
+9 -20
View File
@@ -2,29 +2,20 @@
package org.jetbrains.kotlin.idea.gradleJava.configuration
import com.intellij.gradle.toolingExtension.util.GradleVersionUtil
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId
import kotlinx.coroutines.DEBUG_PROPERTY_NAME
import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_OFF
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.idea.extensions.KotlinJvmDebuggerFacade
import org.jetbrains.plugins.gradle.service.execution.GRADLE_TOOLING_EXTENSION_CLASSES
import org.jetbrains.plugins.gradle.service.execution.joinInitScripts
import org.jetbrains.plugins.gradle.service.execution.loadInitScript
import org.jetbrains.plugins.gradle.service.execution.loadToolingExtensionProvidingInitScript
import org.jetbrains.plugins.gradle.service.execution.toGroovyStringLiteral
import org.jetbrains.plugins.gradle.service.execution.*
import org.jetbrains.plugins.gradle.service.task.GradleTaskManagerExtension
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
class KotlinCoroutineDebugGradleTaskManagerExtension : GradleTaskManagerExtension {
companion object {
private val LOG = Logger.getInstance(this::class.java)
private const val MIN_SUPPORTED_GRADLE_VERSION = "4.6" // CommandLineArgumentProvider is available only since Gradle 4.6
private const val KOTLIN_COROUTINE_DEBUG_SCRIPT_NAME = "ijKotlinCoroutineJvmDebugInit"
}
@@ -36,18 +27,16 @@ class KotlinCoroutineDebugGradleTaskManagerExtension : GradleTaskManagerExtensio
) {
try {
if (KotlinJvmDebuggerFacade.instance?.isCoroutineAgentAllowedInDebug == true) {
if (gradleVersion != null && GradleVersionUtil.isGradleAtLeast(gradleVersion, MIN_SUPPORTED_GRADLE_VERSION)) {
val initScript = joinInitScripts(
loadToolingExtensionProvidingInitScript(GRADLE_TOOLING_EXTENSION_CLASSES),
loadInitScript(
javaClass, "/org/jetbrains/kotlin/idea/gradle/debugging/KotlinCoroutineJvmDebugInit.gradle", mapOf(
"DEBUG_PROPERTY_NAME" to DEBUG_PROPERTY_NAME.toGroovyStringLiteral(),
"DEBUG_PROPERTY_VALUE_OFF" to DEBUG_PROPERTY_VALUE_OFF.toGroovyStringLiteral(),
)
val initScript = joinInitScripts(
loadToolingExtensionProvidingInitScript(GRADLE_TOOLING_EXTENSION_CLASSES),
loadInitScript(
javaClass, "/org/jetbrains/kotlin/idea/gradle/debugging/KotlinCoroutineJvmDebugInit.gradle", mapOf(
"DEBUG_PROPERTY_NAME" to DEBUG_PROPERTY_NAME.toGroovyStringLiteral(),
"DEBUG_PROPERTY_VALUE_OFF" to DEBUG_PROPERTY_VALUE_OFF.toGroovyStringLiteral(),
)
)
settings.addInitScript(KOTLIN_COROUTINE_DEBUG_SCRIPT_NAME, initScript)
}
)
settings.addInitScript(KOTLIN_COROUTINE_DEBUG_SCRIPT_NAME, initScript)
}
} catch (e: Exception) {
LOG.error("Gradle: not possible to attach a coroutine debugger agent.", e)