From 1f82aa5e8ec64b29ea7feddca23b53e73d6a506e Mon Sep 17 00:00:00 2001 From: ghidravore Date: Mon, 29 Apr 2019 15:28:16 -0400 Subject: [PATCH] a few more gradle fixes --- Ghidra/Framework/Graph/build.gradle | 2 +- gradle/javaProject.gradle | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Ghidra/Framework/Graph/build.gradle b/Ghidra/Framework/Graph/build.gradle index 6f1bbb008d..dbad32538c 100644 --- a/Ghidra/Framework/Graph/build.gradle +++ b/Ghidra/Framework/Graph/build.gradle @@ -18,5 +18,5 @@ dependencies { compile "net.sf.jung:jung-visualization:2.1.1" // These have abstract test classes and stubs needed by this module - testCompile project(':Docking').sourceSets.test.output + testCompile project(path: ':Docking', configuration: 'testArtifacts') } diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 581ba68b0e..1f6621d115 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -156,12 +156,3 @@ ext.addExports = { List exports -> } } } - -afterEvaluate { - eclipse.classpath.file.whenMerged { classpath -> - classpath.entries.removeAll { ent -> - ent instanceof Library && !ent.path.endsWith('.jar') - } - classpath.entries.findAll { entry -> entry.kind == 'lib' }*.exported = true - } -}