mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-31 06:27:04 +08:00
Merge remote-tracking branch 'origin/patch'
Conflicts: Ghidra/application.properties
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user