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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+5
View File
@@ -192,6 +192,11 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
args.languageVersion = kotlinOptions.languageVersion args.languageVersion = kotlinOptions.languageVersion
args.jvmTarget = kotlinOptions.jvmTarget args.jvmTarget = kotlinOptions.jvmTarget
args.allowKotlinPackage = kotlinOptions.allowKotlinPackage args.allowKotlinPackage = kotlinOptions.allowKotlinPackage
args.scriptTemplates = kotlinOptions.scriptTemplates
if (args.scriptTemplates?.isNotBlank() ?: false) {
logger.kotlinDebug { "scriptTemplates = ${args.scriptTemplates}" }
}
fun addFriendPathForTestTask(friendKotlinTaskName: String) { fun addFriendPathForTestTask(friendKotlinTaskName: String) {
val friendTask = project.getTasksByName(friendKotlinTaskName, /* recursive = */false).firstOrNull() as? KotlinCompile ?: return val friendTask = project.getTasksByName(friendKotlinTaskName, /* recursive = */false).firstOrNull() as? KotlinCompile ?: return
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSetProviderImpl.kt
+1 -1
View File
@@ -19,7 +19,7 @@ private class KotlinSourceSetImpl(displayName: String, resolver: FileResolver) :
createDefaultSourceDirectorySet(displayName + " Kotlin source", resolver) createDefaultSourceDirectorySet(displayName + " Kotlin source", resolver)
init { init {
kotlin.filter?.include("**/*.java", "**/*.kt") kotlin.filter?.include("**/*.java", "**/*.kt", "**/*.kts")
} }
override fun kotlin(configureClosure: Closure<Any?>?): KotlinSourceSet { override fun kotlin(configureClosure: Closure<Any?>?): KotlinSourceSet {