Add support for script templates settings in gradle plugin, add kts files to source sets

This commit is contained in:
Ilya Chernikov
2016-08-08 16:09:58 +02:00
parent ce6966b486
commit e79d8014fa
2 changed files with 6 additions and 1 deletions
@@ -192,6 +192,11 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
args.languageVersion = kotlinOptions.languageVersion
args.jvmTarget = kotlinOptions.jvmTarget
args.allowKotlinPackage = kotlinOptions.allowKotlinPackage
args.scriptTemplates = kotlinOptions.scriptTemplates
if (args.scriptTemplates?.isNotBlank() ?: false) {
logger.kotlinDebug { "scriptTemplates = ${args.scriptTemplates}" }
}
fun addFriendPathForTestTask(friendKotlinTaskName: String) {
val friendTask = project.getTasksByName(friendKotlinTaskName, /* recursive = */false).firstOrNull() as? KotlinCompile ?: return
@@ -19,7 +19,7 @@ private class KotlinSourceSetImpl(displayName: String, resolver: FileResolver) :
createDefaultSourceDirectorySet(displayName + " Kotlin source", resolver)
init {
kotlin.filter?.include("**/*.java", "**/*.kt")
kotlin.filter?.include("**/*.java", "**/*.kt", "**/*.kts")
}
override fun kotlin(configureClosure: Closure<Any?>?): KotlinSourceSet {