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

gradle-plugin: Warn if both konan.home and konan.version are used

Browse Source 
The gradle plugin ignores the `konan.version` property if the
`konan.home` one is set. This patch prints warning in such cases.
This commit is contained in:
Ilya Matveev
2017-09-19 14:17:12 +03:00
committed by ilmat192
parent 4418eb4eba
commit 47f26f282b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompilerDownloadTask.kt
+6
View File
@@ -45,6 +45,12 @@ open class KonanCompilerDownloadTask : DefaultTask() {
if (!project.hasProperty(KonanPlugin.ProjectProperty.DOWNLOAD_COMPILER)) { if (!project.hasProperty(KonanPlugin.ProjectProperty.DOWNLOAD_COMPILER)) {
val konanHome = project.getProperty(KonanPlugin.ProjectProperty.KONAN_HOME) val konanHome = project.getProperty(KonanPlugin.ProjectProperty.KONAN_HOME)
logger.info("Use a user-defined compiler path: $konanHome") logger.info("Use a user-defined compiler path: $konanHome")
if (project.hasProperty(KonanPlugin.ProjectProperty.KONAN_VERSION)) {
val konanVersion = project.getProperty(KonanPlugin.ProjectProperty.KONAN_VERSION)
logger.warn("${KonanPlugin.ProjectProperty.KONAN_VERSION.propertyName} " +
"(=$konanVersion) property is ignored " +
"because a user-defined compiler path is specified: $konanHome")
}
} else { } else {
try { try {
val konanCompiler = project.konanCompilerName() val konanCompiler = project.konanCompilerName()