Merge remote-tracking branch 'origin/GT-3127_ryanmkurtz_gradle56'

DevGuide.md

@@ -13,7 +13,7 @@ You may not need all of these, depending on which portions you are building or d
       - https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
 * Eclipse - It must support JDK 11. Eclipse 2018-12 or later should work. Other IDEs may work, but we have not tested them.
     - https://www.eclipse.org/downloads/
-* Gradle 5.0 or later - We use version 5.0, and tested with up to 5.5.1.
+* Gradle 5.0 or later - We use version 5.0, and tested with up to 5.6.1.
     - https://gradle.org/next-steps/?version=5.0&format=bin
 * A C/C++ compiler - We use GCC on Linux, Xcode (Clang) on macOS, and Visual Studio 2017 on Windows.
     - https://gcc.gnu.org/

gradle/javaProject.gradle

@@ -161,3 +161,24 @@ ext.addExports = { List<String> 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.
+	classpath.entries.findAll {
+		it.kind == 'src' || it.kind == 'lib'
+	}.each { 
+		it.entryAttributes['test'] = 'false' 
+	}
+}
+