From dc9c6724e168ff8ce70642224a1c255f21843e4b Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Sun, 12 Feb 2023 13:40:07 -0500 Subject: [PATCH 1/2] gradle: Fix compile classpath for scripts sourceSet --- gradle/javaProject.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index e8564e0a22..422c77a630 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -123,6 +123,7 @@ sourceSets { java { srcDir 'developer_scripts' srcDir 'ghidra_scripts' + compileClasspath += main.output } } } @@ -131,6 +132,7 @@ configurations { integrationTestImplementation.extendsFrom testImplementation integrationTestRuntimeOnly.extendsFrom testRuntimeOnly, integrationTestImplementation pcodeTestImplementation.extendsFrom implementation + scriptsImplementation.extendsFrom implementation testArtifacts.extendsFrom testRuntimeOnly integrationTestArtifacts.extendsFrom integrationTestRuntimeOnly screenShotsImplementation.extendsFrom integrationTestImplementation From 804af895a2a7d6fb1e36a036a74ec4530f384cc5 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Sun, 12 Feb 2023 13:42:10 -0500 Subject: [PATCH 2/2] gradle: Fix compile classpath for ghidraClass sourceSet --- GhidraDocs/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/GhidraDocs/build.gradle b/GhidraDocs/build.gradle index 28ab8790ee..d484ae3b57 100644 --- a/GhidraDocs/build.gradle +++ b/GhidraDocs/build.gradle @@ -21,10 +21,15 @@ sourceSets { ghidraClass { java { srcDir 'GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts' + compileClasspath += main.output } } } +configurations { + ghidraClassImplementation.extendsFrom implementation +} + dependencies { api project(':Base') }