gradle: temp debug property "gradle.disable.enhanced.tooling.api" removed

(cherry picked from commit 8bc81a8)
This commit is contained in:
Vladislav.Soroka
2015-01-15 11:42:06 +03:00
parent da2c2b585f
commit 2d4f833aa3
2 changed files with 3 additions and 8 deletions
@@ -154,12 +154,9 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
BuildActionExecuter<ProjectImportAction.AllModels> buildActionExecutor = resolverCtx.getConnection().action(projectImportAction);
// TODO [vlad] remove the check
if (!GradleEnvironment.DISABLE_ENHANCED_TOOLING_API) {
File initScript = GradleExecutionHelper.generateInitScript(isBuildSrcProject, toolingExtensionClasses);
if (initScript != null) {
ContainerUtil.addAll(commandLineArgs, GradleConstants.INIT_SCRIPT_CMD_OPTION, initScript.getAbsolutePath());
}
File initScript = GradleExecutionHelper.generateInitScript(isBuildSrcProject, toolingExtensionClasses);
if (initScript != null) {
ContainerUtil.addAll(commandLineArgs, GradleConstants.INIT_SCRIPT_CMD_OPTION, initScript.getAbsolutePath());
}
GradleExecutionHelper.prepare(
@@ -298,7 +295,6 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
@NotNull final ProjectConnectionDataNodeFunction projectConnectionDataNodeFunction) {
if (projectConnectionDataNodeFunction.myIsPreviewMode
|| GradleEnvironment.DISABLE_ENHANCED_TOOLING_API
|| !new File(projectConnectionDataNodeFunction.myProjectPath).isDirectory()) {
return;
}
@@ -10,7 +10,6 @@ import org.jetbrains.annotations.NonNls;
public class GradleEnvironment {
@NonNls public static final boolean DEBUG_GRADLE_HOME_PROCESSING = Boolean.getBoolean("gradle.debug.home.processing");
@NonNls public static final boolean DISABLE_ENHANCED_TOOLING_API = Boolean.getBoolean("gradle.disable.enhanced.tooling.api");
@NonNls public static final boolean ADJUST_USER_DIR = Boolean.getBoolean("gradle.adjust.userdir");
public static class Headless {