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

Fix compilation of kotlin-gradle-plugin broken after migration to gradle 4.10

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-09-26 18:33:41 +03:00
parent 7b66a4d295
commit cb398ea6b1
2 changed files with 2 additions and 3 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/plugin/mpp/KotlinSoftwareComponent.kt
-1
View File
@@ -76,7 +76,6 @@ internal class KotlinPlatformUsageContext(
override fun getCapabilities(): Set<Capability> = emptySet() override fun getCapabilities(): Set<Capability> = 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<ExcludeRule> = emptySet() override fun getGlobalExcludes(): Set<ExcludeRule> = emptySet()
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinVariants.kt
+2 -2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.artifacts.ExcludeRule
import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.ModuleDependency
import org.gradle.api.artifacts.ModuleIdentifier import org.gradle.api.artifacts.ModuleIdentifier
import org.gradle.api.artifacts.ModuleVersionIdentifier import org.gradle.api.artifacts.ModuleVersionIdentifier
@@ -82,7 +83,6 @@ class KotlinVariantWithMetadataDependency(target: KotlinTarget, private val meta
) : UsageContext by parentUsageContext { ) : UsageContext by parentUsageContext {
override fun getDependencies() = parentUsageContext.dependencies + additionalDependencies 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 override fun getGlobalExcludes(): Set<ExcludeRule> = emptySet()
fun getGlobalExcludes(): Set<Any> = emptySet()
} }
} }