Build: upgrade gradle to 4.10

This commit is contained in:
Vyacheslav Gerasimov
2018-08-30 22:27:05 +03:00
parent 8338a0dd85
commit 1109b795da
19 changed files with 92 additions and 88 deletions
@@ -476,7 +476,7 @@ internal fun configureDefaultVersionsResolutionStrategy(project: Project, kotlin
} else {
configuration.resolutionStrategy.eachDependency { details ->
val requested = details.requested
if (requested.group == "org.jetbrains.kotlin" && requested.version.isEmpty()) {
if (requested.group == "org.jetbrains.kotlin" && requested.version.isNullOrEmpty()) {
details.useVersion(kotlinPluginVersion)
}
}
@@ -6,10 +6,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.DependencyConstraint
import org.gradle.api.artifacts.ModuleDependency
import org.gradle.api.artifacts.PublishArtifact
import org.gradle.api.artifacts.*
import org.gradle.api.attributes.AttributeContainer
import org.gradle.api.attributes.Usage
import org.gradle.api.capabilities.Capability
@@ -80,7 +77,7 @@ internal class KotlinPlatformUsageContext(
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
fun getGlobalExcludes(): Set<Any> = emptySet()
override fun getGlobalExcludes(): Set<ExcludeRule> = emptySet()
}
private fun rewriteMppDependenciesToTargetModuleDependencies(