From da2c2b585fbae3f257fe1c62726287442c9a12b3 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 15 Jan 2015 11:28:18 +0300 Subject: [PATCH] gradle: clear build manager state only if build related gradle configuration changed --- ...leResourceCompilerConfigurationGenerator.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java index 052d18a137e2..ae2f524dd763 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java @@ -163,17 +163,19 @@ public class GradleResourceCompilerConfigurationGenerator { affectedModuleConfigurations.put(module.getName(), resourceConfig); } - boolean configurationUpdateRequired = false; - for (Map.Entry entry : affectedModuleConfigurations.entrySet()) { - GradleModuleResourceConfiguration currentConfiguration = projectConfig.moduleConfigurations.get(entry.getKey()); + boolean configurationUpdateRequired = context.isRebuild() || !gradleConfigFile.exists(); + if(!configurationUpdateRequired) { + for (Map.Entry entry : affectedModuleConfigurations.entrySet()) { + GradleModuleResourceConfiguration currentConfiguration = projectConfig.moduleConfigurations.get(entry.getKey()); - if (currentConfiguration == null || !isSameModuleConfiguration(currentConfiguration, entry.getValue())) { - configurationUpdateRequired = true; - break; + if (currentConfiguration == null || !isSameModuleConfiguration(currentConfiguration, entry.getValue())) { + configurationUpdateRequired = true; + break; + } } } - if (configurationUpdateRequired || context.isRebuild()) { + if (configurationUpdateRequired) { projectConfig.moduleConfigurations.putAll(affectedModuleConfigurations); final Document document = new Document(new Element("gradle-project-configuration"));