Skip to content

Commit 2598443

Browse files
TapchicomaSpace Team
authored and
Space Team
committed
[Gradle] Fix deprecated Configuration.fileCollection method usage
^KT-67888 Fixed
1 parent d5df08e commit 2598443

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.android.build.gradle.BaseExtension
1111
import org.gradle.api.Project
1212
import org.gradle.api.artifacts.Configuration
1313
import org.gradle.api.artifacts.Dependency
14-
import org.gradle.api.artifacts.ExternalDependency
14+
import org.gradle.api.artifacts.component.ModuleComponentIdentifier
1515
import org.gradle.api.attributes.Usage
1616
import org.gradle.api.file.FileCollection
1717
import org.gradle.api.provider.Provider
@@ -309,7 +309,16 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
309309
).disallowChanges()
310310

311311
task.kaptClasspath.from(kaptClasspathConfiguration).disallowChanges()
312-
task.kaptExternalClasspath.from(kaptClasspathConfiguration.fileCollection { it is ExternalDependency })
312+
task.kaptExternalClasspath.from(
313+
kaptClasspathConfiguration
314+
.incoming
315+
.artifactView { artifactView ->
316+
artifactView.componentFilter {
317+
it is ModuleComponentIdentifier
318+
}
319+
}
320+
.files
321+
)
313322
task.kaptClasspathConfigurationNames.value(kaptClasspathConfigurations.map { it.name }).disallowChanges()
314323

315324
KaptWithAndroid.androidVariantData(this)?.annotationProcessorOptionProviders?.let {

0 commit comments

Comments
 (0)