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

Revert usage of lazy task API

Browse Source 
We want to be compatible with Gradle 4.0+
where the API is not available.
Use eager task creation API for now.
Lazy API support should be added later with
proper Gradle versions checks.
This commit is contained in:
Alexey Tsvetkov
2018-11-02 22:04:59 +03:00
parent c42b3b8ff8
commit aae24c993d
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt
+8 -10
View File
@@ -47,18 +47,16 @@ class ScriptingGradleSubplugin : Plugin<Project> {
project.tasks.withType(KotlinCompile::class.java) { task -> project.tasks.withType(KotlinCompile::class.java) { task ->
if (task !is KaptGenerateStubsTask) { if (task !is KaptGenerateStubsTask) {
javaPluginConvention.sourceSets.findByName(task.sourceSetName)?.let { sourceSet -> javaPluginConvention.sourceSets.findByName(task.sourceSetName)?.let { sourceSet ->
project.tasks.register( project.tasks.create(
"discover${task.sourceSetName.capitalize()}ScriptsExtensions", "discover${task.sourceSetName.capitalize()}ScriptsExtensions",
DiscoverScriptExtensionsTask::class.java DiscoverScriptExtensionsTask::class.java
) ) { extensionsTask ->
.also { provider -> task.dependsOn(provider) } extensionsTask.sourceSet = sourceSet
.configure { extensionsTask -> extensionsTask.discoveryClasspathConfiguration =
extensionsTask.sourceSet = sourceSet project.configurations.findByName(getConfigurationName(task.sourceSetName))
extensionsTask.discoveryClasspathConfiguration = extensionsTask.kotlinCompile = task
project.configurations.findByName(getConfigurationName(task.sourceSetName)) task.dependsOn(extensionsTask)
extensionsTask.kotlinCompile = task }
task.dependsOn.add(extensionsTask)
}
} }
} }
} }