mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
IJPL-212619 Gradle: remove unused deprecated API which was marked for removal
Space-RevId: 9e31bc71e1257c8c59fe9d7beb8f8b4f4c0c86ca GitOrigin-RevId: 35c66e85065efb54d22daac237fdbbcc8494a8c9
This commit is contained in:
committed by
intellij-monorepo-bot
parent
5ac73e7cf8
commit
8619262938
@@ -3,9 +3,7 @@ package org.jetbrains.plugins.gradle.service.project.wizard
|
||||
|
||||
import com.intellij.ide.wizard.NewProjectWizardStep
|
||||
import com.intellij.openapi.observable.properties.GraphProperty
|
||||
import com.intellij.openapi.observable.properties.ObservableMutableProperty
|
||||
import com.intellij.openapi.util.Key
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
interface GradleJavaNewProjectWizardData : GradleNewProjectWizardData {
|
||||
|
||||
@@ -13,18 +11,6 @@ interface GradleJavaNewProjectWizardData : GradleNewProjectWizardData {
|
||||
|
||||
var addSampleCode: Boolean
|
||||
|
||||
@Deprecated("Use addSampleCodeProperty instead")
|
||||
val generateOnboardingTipsProperty: ObservableMutableProperty<Boolean>
|
||||
@ApiStatus.ScheduledForRemoval
|
||||
@Deprecated("Use addSampleCodeProperty instead")
|
||||
get() = addSampleCodeProperty
|
||||
|
||||
@Deprecated("Use addSampleCode instead")
|
||||
val generateOnboardingTips: Boolean
|
||||
@ApiStatus.ScheduledForRemoval
|
||||
@Deprecated("Use addSampleCode instead")
|
||||
get() = addSampleCode
|
||||
|
||||
companion object {
|
||||
|
||||
val KEY = Key.create<GradleJavaNewProjectWizardData>(GradleJavaNewProjectWizardData::class.java.name)
|
||||
|
||||
-55
@@ -92,61 +92,6 @@ public final class GradleExecutionHelper {
|
||||
// the bundled JDK for the execution
|
||||
public static final Key<Boolean> AUTO_JAVA_HOME = Key.create("AUTO_JAVA_HOME");
|
||||
|
||||
/**
|
||||
* @deprecated Use the {@link ProjectConnection#newBuild} function directly.
|
||||
* Or use the {@link com.intellij.openapi.externalSystem.util.ExternalSystemUtil#runTask} API for the high-level Gradle task execution.
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
public @NotNull BuildLauncher getBuildLauncher(
|
||||
@NotNull ProjectConnection connection,
|
||||
@NotNull ExternalSystemTaskId id,
|
||||
@NotNull List<String> tasksAndArguments,
|
||||
@NotNull GradleExecutionSettings settings,
|
||||
@NotNull ExternalSystemTaskNotificationListener listener
|
||||
) {
|
||||
BuildLauncher operation = connection.newBuild();
|
||||
prepare(connection, operation, id, tasksAndArguments, settings, listener);
|
||||
return operation;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use the {@link ProjectConnection#newTestLauncher} function directly.
|
||||
* Or use the {@link com.intellij.openapi.externalSystem.util.ExternalSystemUtil#runTask} API for the high-level Gradle task execution.
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
public @NotNull TestLauncher getTestLauncher(
|
||||
@NotNull ProjectConnection connection,
|
||||
@NotNull ExternalSystemTaskId id,
|
||||
@NotNull List<String> tasksAndArguments,
|
||||
@NotNull GradleExecutionSettings settings,
|
||||
@NotNull ExternalSystemTaskNotificationListener listener
|
||||
) {
|
||||
var operation = connection.newTestLauncher();
|
||||
prepare(connection, operation, id, tasksAndArguments, settings, listener);
|
||||
return operation;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Existed for the {@link #getBuildLauncher} and {@link #getTestLauncher} functions.
|
||||
*/
|
||||
@Deprecated
|
||||
private static void prepare(
|
||||
@NotNull ProjectConnection connection,
|
||||
@NotNull LongRunningOperation operation,
|
||||
@NotNull ExternalSystemTaskId id,
|
||||
@NotNull List<String> tasksAndArguments,
|
||||
@NotNull GradleExecutionSettings settings,
|
||||
@NotNull ExternalSystemTaskNotificationListener listener
|
||||
) {
|
||||
GradleExecutionSettings effectiveSettings = new GradleExecutionSettings(settings);
|
||||
effectiveSettings.setTasks(ContainerUtil.concat(effectiveSettings.getTasks(), tasksAndArguments));
|
||||
CancellationToken cancellationToken = GradleConnector.newCancellationTokenSource().token();
|
||||
GradleExecutionContextImpl context = new GradleExecutionContextImpl("", id, effectiveSettings, listener, cancellationToken);
|
||||
BuildEnvironment buildEnvironment = getBuildEnvironment(connection, context);
|
||||
context.setBuildEnvironment(buildEnvironment);
|
||||
prepareForExecution(operation, context);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated use the {@link GradleExecutionHelper#execute} function with {@link GradleExecutionContext} instead.
|
||||
* The {@link BuildEnvironment} model will be automatically provided to {@link GradleExecutionContext}.
|
||||
|
||||
-7
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.plugins.gradle.GradleManager;
|
||||
import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider;
|
||||
import org.jetbrains.plugins.gradle.service.task.GradleTaskManagerExtension;
|
||||
import org.jetbrains.plugins.gradle.service.task.GradleTaskManagerExtensionDebuggerBridge;
|
||||
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings;
|
||||
|
||||
import java.util.*;
|
||||
@@ -217,12 +216,6 @@ public interface GradleProjectResolverExtension extends ParametersEnhancer {
|
||||
@Deprecated
|
||||
String GRADLE_VERSION = "GRADLE_VERSION";
|
||||
|
||||
/**
|
||||
* @deprecated use {@link GradleTaskManagerExtensionDebuggerBridge#DEBUGGER_ENABLED} instead
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
String DEBUGGER_ENABLED = GradleTaskManagerExtensionDebuggerBridge.DEBUGGER_ENABLED;
|
||||
|
||||
/**
|
||||
* @deprecated use {@link GradleTaskManagerExtension#configureTasks(String, ExternalSystemTaskId, GradleExecutionSettings, GradleVersion)} instead
|
||||
*/
|
||||
|
||||
@@ -43,12 +43,6 @@ class GradleModuleData(private val dataNode: DataNode<out ModuleData>) {
|
||||
val gradleIdentityPath: String
|
||||
get() = moduleData.gradleIdentityPath
|
||||
|
||||
@Deprecated("Use gradleIdentityPathOrNull instead")
|
||||
val fullGradlePath: String
|
||||
@ApiStatus.ScheduledForRemoval
|
||||
@Deprecated("Use gradleIdentityPathOrNull instead")
|
||||
get() = gradleIdentityPath
|
||||
|
||||
val isBuildSrcModule: Boolean
|
||||
get() = moduleData.isBuildSrcModule()
|
||||
|
||||
|
||||
-10
@@ -66,16 +66,6 @@ public final class GradleVersionUtil {
|
||||
return isGradleNewerThan(GradleVersion.version(actualVersion), version);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated See {@link GradleVersionUtil#isCurrentGradleNewerThan} for details
|
||||
*/
|
||||
@ApiStatus.ScheduledForRemoval
|
||||
@Deprecated
|
||||
@SuppressWarnings("DeprecatedIsStillUsed")
|
||||
public static boolean isCurrentGradleOlderOrSameAs(@NotNull String version) {
|
||||
return !isCurrentGradleNewerThan(version);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated See {@link GradleVersionUtil#isCurrentGradleNewerThan} for details
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user