azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kotlin Facet: Import Gradle properties defined in gradle.properties file

Browse Source
This commit is contained in:
Alexey Sedunov
2017-01-25 18:08:58 +03:00
parent f8349da608
commit 6e8d0b520e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
+10 -8
View File
@@ -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.service.project.manage.AbstractProjectDataService
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.project.Project 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.CoroutineSupport
import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.config.TargetPlatformKind 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 { 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() return CoroutineSupport.DEFAULT
properties.load(localPropertiesFile.inputStream)
val coroutinesProperty = properties.getProperty("kotlin.coroutines") ?: return CoroutineSupport.DEFAULT
return CoroutineSupport.byCompilerArgument(coroutinesProperty)
} }