diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt index 28202efb262..403285cba0a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzer.kt @@ -9,8 +9,6 @@ import org.gradle.api.artifacts.transform.InputArtifact import org.gradle.api.artifacts.transform.TransformAction import org.gradle.api.artifacts.transform.TransformOutputs import org.gradle.api.artifacts.transform.TransformParameters -import org.gradle.api.file.FileSystemLocation -import org.gradle.api.provider.Provider import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassWriter import java.io.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index bf46240ee00..e57fe96f1b4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -15,7 +15,6 @@ import org.gradle.api.artifacts.transform.TransformAction import org.gradle.api.artifacts.transform.TransformOutputs import org.gradle.api.artifacts.transform.TransformParameters import org.gradle.api.attributes.Attribute -import org.gradle.api.file.FileSystemLocation import org.gradle.api.plugins.JavaPluginConvention import org.gradle.api.provider.Provider import org.gradle.api.tasks.compile.AbstractCompile @@ -29,6 +28,7 @@ import org.jetbrains.kotlin.gradle.scripting.ScriptingExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.scripting.compiler.plugin.impl.reporter import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource +import java.io.File import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration private const val SCRIPTING_LOG_PREFIX = "kotlin scripting plugin:" @@ -133,7 +133,6 @@ private fun getDiscoveryResultsConfigurationName(sourceSetName: String): String getDiscoveryClasspathConfigurationName(sourceSetName) + RESULTS_CONFIGURATION_SUFFIX - private fun configureDiscoveryTransformation( project: Project, discoveryConfiguration: Configuration, @@ -153,11 +152,11 @@ private fun configureDiscoveryTransformation( } internal abstract class DiscoverScriptExtensionsTransformAction : TransformAction { - @InputArtifact - abstract fun getInputArtifact(): Provider + @get:InputArtifact + abstract val inputArtifact: File override fun transform(outputs: TransformOutputs) { - val input = getInputArtifact().get().asFile + val input = inputArtifact val definitions = ScriptDefinitionsFromClasspathDiscoverySource(