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

Misc: Reverted 1fb90ac0fd 'Copy compiler arguments from iml even if "Use project settings" checkbox is checked' as it's rendered obsolete due to "Use project settings" being turned off by default in Gradle/Maven projects

Browse Source
This commit is contained in:
Alexey Sedunov
2017-01-26 14:50:33 +03:00
parent 6e8d0b520e
commit deb9258994
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
+7 -13
View File
@@ -65,22 +65,16 @@ class JpsKotlinCompilerSettings : JpsElementBase<JpsKotlinCompilerSettings>() {
fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments {
val defaultArguments = getSettings(module.project).commonCompilerArguments val defaultArguments = getSettings(module.project).commonCompilerArguments
val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments
if (facetSettings.useProjectSettings) return defaultArguments
val (languageLevel, apiLevel) = facetSettings.versionInfo val (languageLevel, apiLevel) = facetSettings.versionInfo
val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments
return copyBean(facetArguments).apply { return copyBean(facetArguments).apply {
if (facetSettings.useProjectSettings) { languageVersion = languageLevel?.description
languageVersion = defaultArguments.languageVersion apiVersion = apiLevel?.description
apiVersion = defaultArguments.apiVersion multiPlatform = module
multiPlatform = defaultArguments.multiPlatform .dependenciesList
} .dependencies
else { .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common }
languageVersion = languageLevel?.description
apiVersion = apiLevel?.description
multiPlatform = module
.dependenciesList
.dependencies
.any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common }
}
} }
} }