From cb398ea6b108b9b0b63c1a2b81e4f9b683615018 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 26 Sep 2018 18:33:41 +0300 Subject: [PATCH] Fix compilation of kotlin-gradle-plugin broken after migration to gradle 4.10 --- .../kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt | 1 - .../org/jetbrains/kotlin/gradle/plugin/mpp/kotlinVariants.kt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt index c3129bd7c80..84eb23fd7c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt @@ -76,7 +76,6 @@ internal class KotlinPlatformUsageContext( override fun getCapabilities(): Set = emptySet() - // FIXME this is a stub for a function that is not present in the Gradle API that we compile against override fun getGlobalExcludes(): Set = emptySet() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinVariants.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinVariants.kt index 6c7979205b8..dd902982c52 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinVariants.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinVariants.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp +import org.gradle.api.artifacts.ExcludeRule import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.ModuleIdentifier import org.gradle.api.artifacts.ModuleVersionIdentifier @@ -82,7 +83,6 @@ class KotlinVariantWithMetadataDependency(target: KotlinTarget, private val meta ) : UsageContext by parentUsageContext { override fun getDependencies() = parentUsageContext.dependencies + additionalDependencies - // FIXME this is a stub for a function that is not present in the Gradle API that we compile against - fun getGlobalExcludes(): Set = emptySet() + override fun getGlobalExcludes(): Set = emptySet() } }