From ada66c4f698e48ed01d3bd787af2bfd96f5f661b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Sep 2019 10:40:03 +0200
Subject: [PATCH] Upgradle to 5.6.2 and remove workaround

---
 .../main/kotlin/java-library-conventions.gradle.kts  | 12 ------------
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 4829e89279d..a35bdd8bf06 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -32,18 +32,6 @@ sourceSets {
 eclipse {
 	classpath {
 		plusConfigurations.add(shadowed)
-
-		// Workaround for https://github.com/gradle/gradle/issues/10393
-		file {
-			whenMerged(Action<org.gradle.plugins.ide.eclipse.model.Classpath> {
-				entries = entries.distinctBy {
-					if (it is org.gradle.plugins.ide.eclipse.model.ProjectDependency)
-						it.path
-					else
-						it
-				}
-			})
-		}
 	}
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59b5f892888..7c4388a9216 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists