From 5d79c079b4ee2bf16d78d8ebc235ae9db69367d7 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Thu, 21 Sep 2017 17:30:14 +0300 Subject: [PATCH] gradle-plugin: Accept Any as includeDir and inputDir --- .../org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt | 2 +- .../org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt index c4383cb3df5..fa05d37c462 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt @@ -184,7 +184,7 @@ open class KonanCompileConfig( // DSL. Input/output files - fun inputDir(dir: String) = with(compilationTask) { + fun inputDir(dir: Any) = with(compilationTask) { _inputFiles.add(project.fileTree(dir)) } fun inputFiles(vararg files: Any) = with(compilationTask) { diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt index ae9b30da228..35367028e5a 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt @@ -173,9 +173,8 @@ open class KonanInteropConfig( headers.add(files) } - - fun includeDirs(vararg values: String) = with(interopProcessingTask) { - compilerOpts.addAll(values.map { "-I$it" }) + fun includeDirs(vararg values: Any) = with(interopProcessingTask) { + compilerOpts.addAll(values.map { "-I${project.file(it).canonicalPath}" }) } fun linkerOpts(vararg values: String) = linkerOpts(values.toList())