From 49061a9324419c14a386d94fdcee7b95efa0e46c Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Mon, 3 Dec 2018 10:42:54 +0300
Subject: [PATCH] IDEA-CR-40755 API compatibility breakage fix

---
 .../gradle/settings/DefaultGradleProjectSettings.java     | 2 +-
 .../gradle/settings/GradleSystemRunningSettings.java      | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/DefaultGradleProjectSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/DefaultGradleProjectSettings.java
index 0214d6fe3dbf..f6df32678c3c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/DefaultGradleProjectSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/DefaultGradleProjectSettings.java
@@ -73,7 +73,7 @@ public class DefaultGradleProjectSettings implements PersistentStateComponent<De
   @SuppressWarnings("deprecation")
   private void migrateOldSettings() {
     GradleSystemRunningSettings oldAppSettings = GradleSystemRunningSettings.getInstance();
-    myDelegatedBuild = oldAppSettings.isDelegatedBuildEnabledByDefault();
+    myDelegatedBuild = oldAppSettings.isUseGradleAwareMake();
     GradleSystemRunningSettings.PreferredTestRunner oldTestRunner = oldAppSettings.getDefaultTestRunner();
     if (oldTestRunner == GradleSystemRunningSettings.PreferredTestRunner.PLATFORM_TEST_RUNNER) {
       myTestRunner = TestRunner.PLATFORM;
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java
index c2cfd90ac456..4dabcd43e749 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java
@@ -5,6 +5,7 @@ import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.module.Module;
 import com.intellij.util.xmlb.annotations.OptionTag;
 import org.gradle.internal.impldep.com.google.common.base.Objects;
 import org.jetbrains.annotations.ApiStatus;
@@ -50,8 +51,11 @@ public class GradleSystemRunningSettings implements PersistentStateComponent<Gra
     return myPreferredTestRunner;
   }
 
-  @OptionTag("useGradleAwareMake")
-  public boolean isDelegatedBuildEnabledByDefault() {
+  /**
+   * @deprecated use {@link GradleSettingsService#isDelegatedBuildEnabled(Module)} )
+   */
+  @Deprecated
+  public boolean isUseGradleAwareMake() {
     return myDelegatedBuildEnabledByDefault;
   }