Differential D10712 Diff 26979 files/fix-resolution-ambiguity-with-gradle-6-8.patch

Changeset View

Standalone View

				From 946e0bbffd6d5c5b39ae03f2c3175f2bb785ed97 Mon Sep 17 00:00:00 2001
				From: Campbell Jones <git@serebit.com>
				Date: Fri, 19 Mar 2021 10:01:51 -0400
				Subject: [PATCH 1/2] Fix build error with Gradle 6.8

				---
				gradle/jps.gradle.kts \| 2 +-
				1 file changed, 1 insertion(+), 1 deletion(-)

				diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
				index ae68ee418449..e89b34b4a20e 100644
				--- a/gradle/jps.gradle.kts
				+++ b/gradle/jps.gradle.kts
				@@ -480,7 +480,7 @@ fun RecursiveArtifact.jarContentsFromConfiguration(configuration: Configuration)

				resolvedArtifacts.filter { it.id.componentIdentifier is ModuleComponentIdentifier }
				.map { it.file }
				- .forEach(::extractedDirectory)
				+ .forEach { extractedDirectory(it) }

				resolvedArtifacts
				.map { it.id.componentIdentifier }

				From 5deb1be69bc30552348741e966077777afb0b31c Mon Sep 17 00:00:00 2001
				From: Campbell Jones <git@serebit.com>
				Date: Fri, 19 Mar 2021 10:10:36 -0400
				Subject: [PATCH 2/2] Fix additional resolution ambiguity error

				---
				prepare/idea-plugin/build.gradle.kts \| 2 +-
				1 file changed, 1 insertion(+), 1 deletion(-)

				diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
				index 7cb552afaaa8..a5cf3cbc4e97 100644
				--- a/prepare/idea-plugin/build.gradle.kts
				+++ b/prepare/idea-plugin/build.gradle.kts
				@@ -202,7 +202,7 @@ dependencies {

				(libraries.dependencies + gradleToolingModel.dependencies)
				.map { if (it is ProjectDependency) it.dependencyProject else it }
				- .forEach(::compile)
				+ .forEach { compile(it) }
				}

				val jar = runtimeJar {