Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 16:50:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source 
Conflicts:
	Ghidra/application.properties
This commit is contained in:
Ryan Kurtz
2023-12-22 10:18:51 -05:00
parent 14c24d8dda 4d85657231
commit 5d2a3e12d5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Generic/build.gradle
+8 -3
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))
}
}
}
} }
gradle/processorProject.gradle
+1 -4
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 {