diff --git a/build.gradle b/build.gradle index 18a2b197..3f71d41e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'nexus' apply plugin: 'codenarc' group = 'com.github.ben-manes' -version = '0.32.0' +version = '0.33.0' sourceCompatibility = '1.8' diff --git a/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy b/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy index b87818fc..d62f1f60 100644 --- a/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy +++ b/src/main/groovy/com/github/benmanes/gradle/versions/updates/Resolver.groovy @@ -131,9 +131,13 @@ class Resolver { copy.setCanBeResolved(true) } - // Resolve using the latest version of explicitly declaired dependencies and retains those - // inherited from the super configurations (which may be required for variant resolution). - Set inherited = (configuration.allDependencies - configuration.dependencies) + // Resolve using the latest version of explicitly declaired dependencies and retains Kotlin's + // inherited stdlib dependencies from the super configurations. This is required for variant + // resolution, but the full set can break consumer capability matching. + Set inherited = configuration.allDependencies.findAll { dependency -> + (dependency instanceof ExternalDependency) && (dependency.group == 'org.jetbrains.kotlin') + }.minus(configuration.dependencies) + copy.dependencies.clear() copy.dependencies.addAll(latest) copy.dependencies.addAll(inherited)