From 6e8d0b520e74ca521e3c0f31f39315e726f799cb Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 25 Jan 2017 18:08:58 +0300
Subject: [PATCH] Kotlin Facet: Import Gradle properties defined in
 gradle.properties file

---
 .../KotlinGradleProjectDataService.kt          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
index 2a6c1af0db7..81eced1e2a9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
@@ -24,8 +24,6 @@ import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsPr
 import com.intellij.openapi.externalSystem.service.project.manage.AbstractProjectDataService
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.project.Project
-import com.intellij.util.text.VersionComparatorUtil
-import org.jetbrains.kotlin.cli.common.arguments.*
 import org.jetbrains.kotlin.config.CoroutineSupport
 import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.config.TargetPlatformKind
@@ -93,12 +91,16 @@ class KotlinGradleProjectDataService : AbstractProjectDataService<GradleSourceSe
     }
 }
 
+private val gradlePropertyFiles = listOf("local.properties", "gradle.properties")
+
 private fun findKotlinCoroutinesProperty(project: Project): CoroutineSupport {
-    val localPropertiesFile = project.baseDir.findChild("local.properties") ?: return CoroutineSupport.DEFAULT
+    for (propertyFileName in gradlePropertyFiles) {
+        val propertyFile = project.baseDir.findChild(propertyFileName) ?: continue
+        val properties = Properties()
+        properties.load(propertyFile.inputStream)
+        val coroutinesProperty = properties.getProperty("kotlin.coroutines") ?: continue
+        return CoroutineSupport.byCompilerArgument(coroutinesProperty)
+    }
 
-    val properties = Properties()
-    properties.load(localPropertiesFile.inputStream)
-    val coroutinesProperty = properties.getProperty("kotlin.coroutines") ?: return CoroutineSupport.DEFAULT
-
-    return CoroutineSupport.byCompilerArgument(coroutinesProperty)
+    return CoroutineSupport.DEFAULT
 }
\ No newline at end of file