From 041465efc8b79676c3286f7d3bff3cda13abb4ed Mon Sep 17 00:00:00 2001 From: GameCubeGBA <95232096+GameCubeGBA@users.noreply.github.com> Date: Sat, 8 Jan 2022 12:12:05 -0500 Subject: [PATCH] Remove workaround for old Gradle version we don't support anymore Since we now use Gradle version 6 and up, and the GitHub issue attached to the bug was resolved in Gradle 5.6.3, we don't need this workaround code anymore. --- gradle/javaProject.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index d48192e229..97d443f07d 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -188,13 +188,6 @@ ext.addExports = { List exports -> // Fixup generated Eclipse projects apply plugin: 'eclipse' eclipse.classpath.file.whenMerged { classpath -> - - // Gradle 5.6 has a bug that creates duplicate classpath entries, so we must dedupe them. - // https://github.com/gradle/gradle/issues/10393 - classpath.entries.unique(true) { - (it instanceof org.gradle.plugins.ide.eclipse.model.ProjectDependency) ? it.path : it - } - // Prevent Gradle 5.6 from setting the 'test' attribute on our test source folders and jars. // If we don't do this, things that we have outside of test directories that depend on test // libraries (like junit) will not compile in Eclipse.