Polish Eclipse IDE support

sbrannen · sbrannen · commit 2d65bce18ee2 · 2021-09-14T21:59:32.000+02:00
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
@@ -19,16 +19,18 @@ eclipse.classpath.file.whenMerged { classpath ->
 			def projectName = matcher[0][1]
 			def path = "/${projectName}"
 			if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
+				def recursiveDependency = entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')
 				// Avoid recursive dependency on current project.
-				if (!entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')) {
-					def dependency = new ProjectDependency(path)
-					dependency.exported = true
-					classpath.entries.add(dependency)
+				if (!recursiveDependency) {
+					classpath.entries.add(new ProjectDependency(path))
 				}
 			}
 			classpath.entries.remove(entry)
 		}
 	}
+
+	// Remove any remaining direct depencencies on JARs in the build/libs folder
+	// except Spring's spring-cglib-repack and spring-objenesis-repack JARs.
 	classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,18 @@ eclipse.classpath.file.whenMerged { classpath ->`
`19`	`19`	`def projectName = matcher[0][1]`
`20`	`20`	`def path = "/${projectName}"`
`21`	`21`	`if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {`
	`22`	`+ def recursiveDependency = entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main\|test)')`
`22`	`23`	`// Avoid recursive dependency on current project.`
`23`		`- if (!entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main\|test)')) {`
`24`		`- def dependency = new ProjectDependency(path)`
`25`		`- dependency.exported = true`
`26`		`- classpath.entries.add(dependency)`
	`24`	`+ if (!recursiveDependency) {`
	`25`	`+ classpath.entries.add(new ProjectDependency(path))`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`classpath.entries.remove(entry)`
`30`	`29`	`}`
`31`	`30`	`}`
	`31`	`+`
	`32`	`+ // Remove any remaining direct depencencies on JARs in the build/libs folder`
	`33`	`+ // except Spring's spring-cglib-repack and spring-objenesis-repack JARs.`
`32`	`34`	`classpath.entries.removeAll { entry -> (entry.path =~ /(?!.?repack.\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }`
`33`	`35`	`}`
`34`	`36`