mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabling "GP-2302: Upgrading protobuf to 3.21.6" for master

Browse Source 
This reverts commit 376f780874.
This commit is contained in:
Ryan Kurtz
2022-10-17 12:37:53 -04:00
parent e48153b1e9
commit 843aee1df1
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Debug/Debugger-gadp/Module.manifest
View File

@@ -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

24
Ghidra/Debug/Debugger-gadp/build.gradle
View File

@@ -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'
}
}*/