Skip to content

Commit

Permalink
GP-4164: Improving guava-related build issue fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanmkurtz committed Dec 22, 2023
1 parent fac3840 commit 4d85657
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
11 changes: 8 additions & 3 deletions Ghidra/Framework/Generic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@ dependencies {
api "org.bouncycastle:bcprov-jdk15on:1.69"
api "org.bouncycastle:bcutil-jdk15on:1.69"


compileOnly "junit:junit:4.12"

constraints {
api("com.google.guava:guava") {
attributes {
attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment, TargetJvmEnvironment.STANDARD_JVM))
}
}
}
}


2 changes: 1 addition & 1 deletion Ghidra/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
application.name=Ghidra
application.version=11.0.1
application.version=11.0
application.release.name=DEV
application.layout.version=1
application.gradle.min=7.3
Expand Down
5 changes: 1 addition & 4 deletions gradle/processorProject.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
*
*****************************************************************************************/
configurations {
sleighConfig {
// The following line is needed so newer versions of guava can be resolved
attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
}
sleighConfig
}

dependencies {
Expand Down

0 comments on commit 4d85657

Please sign in to comment.