mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-09-13 21:56:19 +00:00
Merge remote-tracking branch 'origin/GP-2302_ryanmkurtz_protobuf'
(Closes #4415, Closes #4540)
This commit is contained in:
commit
7d23e773f3
|
@ -1 +1 @@
|
|||
MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD-3-GOOGLE
|
||||
MODULE FILE LICENSE: lib/protobuf-java-3.21.6.jar BSD-3-GOOGLE
|
||||
|
|
|
@ -33,33 +33,33 @@ configurations {
|
|||
def platform = getCurrentPlatformName()
|
||||
|
||||
dependencies {
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:windows-x86_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:linux-x86_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:linux-aarch_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:osx-x86_64@exe'
|
||||
allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:osx-aarch_64@exe'
|
||||
|
||||
if (isCurrentWindows()) {
|
||||
protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
|
||||
protocArtifact 'com.google.protobuf:protoc:3.21.6:windows-x86_64@exe'
|
||||
}
|
||||
if (isCurrentLinux()) {
|
||||
if (platform.endsWith("x86_64")) {
|
||||
protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
|
||||
protocArtifact 'com.google.protobuf:protoc:3.21.6:linux-x86_64@exe'
|
||||
}
|
||||
else {
|
||||
protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
|
||||
protocArtifact 'com.google.protobuf:protoc:3.21..6:linux-aarch_64@exe'
|
||||
}
|
||||
}
|
||||
if (isCurrentMac()) {
|
||||
if (platform.endsWith("x86_64")) {
|
||||
protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
|
||||
protocArtifact 'com.google.protobuf:protoc:3.21.6:osx-x86_64@exe'
|
||||
}
|
||||
else {
|
||||
protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
|
||||
protocArtifact 'com.google.protobuf:protoc:3.21.6:osx-aarch_64@exe'
|
||||
}
|
||||
}
|
||||
|
||||
api 'com.google.protobuf:protobuf-java:3.17.3'
|
||||
api 'com.google.protobuf:protobuf-java:3.21.6'
|
||||
api project(':Framework-AsyncComm')
|
||||
api project(':Framework-Debugging')
|
||||
api project(':ProposedUtils')
|
||||
|
@ -70,7 +70,7 @@ dependencies {
|
|||
|
||||
/*protobuf {
|
||||
protoc {
|
||||
artifact = 'com.google.protobuf:protoc:3.17.3'
|
||||
artifact = 'com.google.protobuf:protoc:3.21.6'
|
||||
}
|
||||
}*/
|
||||
|
||||
|
|
Loading…
Reference in a new issue