Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-12-04 02:42:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-4164: Improving guava-related build issue fix

Browse Source
This commit is contained in:
Ryan Kurtz 2023-12-22 09:34:08 -05:00
parent fac384093f
commit 4d85657231
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Framework/Generic/build.gradle
View File

@ -41,8 +41,13 @@ dependencies {
api "org.bouncycastle:bcprov-jdk15on:1.69" api "org.bouncycastle:bcprov-jdk15on:1.69"
api "org.bouncycastle:bcutil-jdk15on:1.69" api "org.bouncycastle:bcutil-jdk15on:1.69"
compileOnly "junit:junit:4.12" 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
Ghidra/application.properties
View File

@ -1,5 +1,5 @@
application.name=Ghidra application.name=Ghidra
application.version=11.0.1 application.version=11.0
application.release.name=DEV application.release.name=DEV
application.layout.version=1 application.layout.version=1
application.gradle.min=7.3 application.gradle.min=7.3

5
gradle/processorProject.gradle
View File

@ -30,10 +30,7 @@
* *
*****************************************************************************************/ *****************************************************************************************/
configurations { configurations {
sleighConfig { 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))
}
} }
dependencies { dependencies {