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

gradle-plugin: Accept Any as includeDir and inputDir

Browse Source
This commit is contained in:
Ilya Matveev
2017-09-21 17:30:14 +03:00
committed by ilmat192
parent beb6c3eb10
commit 5d79c079b4
2 changed files with 3 additions and 4 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/KonanCompileTask.kt
+1 -1
View File
@@ -184,7 +184,7 @@ open class KonanCompileConfig(
// DSL. Input/output files // DSL. Input/output files
fun inputDir(dir: String) = with(compilationTask) { fun inputDir(dir: Any) = with(compilationTask) {
_inputFiles.add(project.fileTree(dir)) _inputFiles.add(project.fileTree(dir))
} }
fun inputFiles(vararg files: Any) = with(compilationTask) { fun inputFiles(vararg files: Any) = with(compilationTask) {
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt
+2 -3
View File
@@ -173,9 +173,8 @@ open class KonanInteropConfig(
headers.add(files) headers.add(files)
} }
fun includeDirs(vararg values: Any) = with(interopProcessingTask) {
fun includeDirs(vararg values: String) = with(interopProcessingTask) { compilerOpts.addAll(values.map { "-I${project.file(it).canonicalPath}" })
compilerOpts.addAll(values.map { "-I$it" })
} }
fun linkerOpts(vararg values: String) = linkerOpts(values.toList()) fun linkerOpts(vararg values: String) = linkerOpts(values.toList())