MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle|Sync|IsolatedProject] fix: moved Gradle task isJavaForkOptions property resolution to the Gradle common code.

Browse Source 
Removed Gradle JavaTask model and module with related classes that contained only isJavaForkOptions property.

Issues IDEA-35499

GitOrigin-RevId: adcc9fc0a8c01fef019f5889578349c11f58101c
This commit is contained in:
Sergei Vorobyov
2024-09-30 14:12:07 +02:00
committed by intellij-monorepo-bot
parent c2e3ebee0d
commit e345cf6fec
9 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/external-system-api/api-dump.txt
View File

@@ -890,10 +890,12 @@ f:com.intellij.openapi.externalSystem.model.task.TaskData
- getType():java.lang.String
- hashCode():I
- isInherited():Z
- isJvm():Z
- isJvmTest():Z
- isTest():Z
- setGroup(java.lang.String):V
- setInherited(Z):V
- setJvm(Z):V
- setJvmTest(Z):V
- setTest(Z):V
- setType(java.lang.String):V

13
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/TaskData.java
View File

@@ -19,6 +19,7 @@ public final class TaskData extends AbstractExternalEntityData implements Extern
@Nullable private String group;
@Nullable private String type;
private boolean inherited;
private boolean isJvm;
private boolean isTest;
private boolean isJvmTest;
@@ -75,6 +76,14 @@ public final class TaskData extends AbstractExternalEntityData implements Extern
this.inherited = inherited;
}
public boolean isJvm() {
return isJvm;
}
public void setJvm(boolean isJvm) {
this.isJvm = isJvm;
}
public boolean isTest() {
return isTest;
}
@@ -87,8 +96,8 @@ public final class TaskData extends AbstractExternalEntityData implements Extern
return isJvmTest;
}
public void setJvmTest(boolean test) {
isJvmTest = test;
public void setJvmTest(boolean isJvmTest) {
this.isJvmTest = isJvmTest;
}
@Override

1
plugins/gradle/native/tooling/testSources/org/jetbrains/plugins/gradle/nativeplatform/tooling/model/SerializationDataTestCase.kt
View File

@@ -170,6 +170,7 @@ abstract class SerializationDataTestCase {
if (expected == null || actual == null) return
assertEquals(expected.description, actual.description)
assertEquals(expected.group, actual.group)
assertEquals(expected.isJvm, actual.isJvm)
assertEquals(expected.isTest, actual.isTest)
assertEquals(expected.isJvmTest, actual.isJvmTest)
assertEquals(expected.isInherited, actual.isInherited)

1
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/CommonGradleProjectResolverExtension.java
View File

@@ -705,6 +705,7 @@ public final class CommonGradleProjectResolverExtension extends AbstractProjectR
TaskData taskData = new TaskData(GradleConstants.SYSTEM_ID, taskName, directoryToRunTask, task.getDescription());
taskData.setGroup(taskGroup);
taskData.setType(task.getType());
taskData.setJvm(task.isJvm());
taskData.setTest(task.isTest());
taskData.setJvmTest(task.isJvmTest());
taskData.setInherited(task.isInherited());

1
plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleTaskData.kt
View File

@@ -15,6 +15,7 @@ class GradleTaskData(val node: DataNode<TaskData>, private val gradleModulePath:
val name = data.name.run { substringAfterLast(':').nullize() ?: this }
val description = data.description
val group = data.group
val isJvm = data.isJvm
val isTest = data.isTest
val isJvmTest = data.isJvmTest
val isInherited = data.isInherited

2
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalTask.java
View File

@@ -35,6 +35,8 @@ public interface ExternalTask extends Serializable {
@Nullable
String getType();
boolean isJvm();
boolean isTest();
boolean isJvmTest();

2
plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/taskModel/GradleTaskModelBuilder.kt
View File

@@ -7,6 +7,7 @@ import com.intellij.gradle.toolingExtension.impl.util.GradleTaskUtil
import org.gradle.api.Project
import org.gradle.api.tasks.testing.AbstractTestTask
import org.gradle.api.tasks.testing.Test
import org.gradle.process.JavaForkOptions
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.plugins.gradle.model.DefaultExternalTask
import org.jetbrains.plugins.gradle.model.GradleTaskModel
@@ -36,6 +37,7 @@ class GradleTaskModelBuilder : AbstractModelBuilderService() {
externalTask.qName = task.path
externalTask.description = task.description
externalTask.group = GradleObjectUtil.notNull(task.group, "other")
externalTask.isJvm = task is JavaForkOptions
val isInternalTest = GradleTaskUtil.getBooleanProperty(task, "idea.internal.test", false)
val isEffectiveTest = "check" == task.name && "verification" == task.group
val isJvmTest = task is Test

3
plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/taskModel/GradleTaskSerialisationService.kt
View File

@@ -45,6 +45,7 @@ class GradleTaskSerialisationService : SerializationService<GradleTaskModel> {
private const val TASK_DESCRIPTION_FIELD: String = "description"
private const val TASK_GROUP_FIELD: String = "group"
private const val TASK_TYPE_FIELD: String = "type"
private const val TASK_IS_JVM_FIELD: String = "isJvm"
private const val TASK_IS_TEST_FIELD: String = "isTest"
private const val TASK_IS_JVM_TEST_FIELD: String = "isJvmTest"
private const val TASK_IS_INHERITED_FIELD: String = "isInherited"
@@ -89,6 +90,7 @@ class GradleTaskSerialisationService : SerializationService<GradleTaskModel> {
writeString(writer, TASK_DESCRIPTION_FIELD, task.description)
writeString(writer, TASK_GROUP_FIELD, task.group)
writeString(writer, TASK_TYPE_FIELD, task.type)
writeBoolean(writer, TASK_IS_JVM_FIELD, task.isJvm)
writeBoolean(writer, TASK_IS_TEST_FIELD, task.isTest)
writeBoolean(writer, TASK_IS_JVM_TEST_FIELD, task.isJvmTest)
writeBoolean(writer, TASK_IS_INHERITED_FIELD, task.isInherited)
@@ -105,6 +107,7 @@ class GradleTaskSerialisationService : SerializationService<GradleTaskModel> {
description = readString(reader, TASK_DESCRIPTION_FIELD)
group = readString(reader, TASK_GROUP_FIELD)
type = readString(reader, TASK_TYPE_FIELD)
isJvm = readBoolean(reader, TASK_IS_JVM_FIELD)
isTest = readBoolean(reader, TASK_IS_TEST_FIELD)
isJvmTest = readBoolean(reader, TASK_IS_JVM_TEST_FIELD)
isInherited = readBoolean(reader, TASK_IS_INHERITED_FIELD)

12
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalTask.java
View File

@@ -16,6 +16,8 @@ public final class DefaultExternalTask implements ExternalTask {
@Nullable
private String type;
private boolean isJvm;
private boolean isTest;
private boolean isJvmTest;
@@ -31,6 +33,7 @@ public final class DefaultExternalTask implements ExternalTask {
description = externalTask.getDescription();
group = externalTask.getGroup();
type = externalTask.getType();
isJvm = externalTask.isJvm();
isTest = externalTask.isTest();
isJvmTest = externalTask.isJvmTest();
isInherited = externalTask.isInherited();
@@ -86,6 +89,15 @@ public final class DefaultExternalTask implements ExternalTask {
this.type = type;
}
@Override
public boolean isJvm() {
return isJvm;
}
public void setJvm(boolean isJvm) {
this.isJvm = isJvm;
}
@Override
public boolean isTest() {
return isTest;