Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 15:45:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2302_ryanmkurtz_protobuf'

Browse Source 
(Closes #4415, Closes #4540)
This commit is contained in:
Ryan Kurtz
2022-09-27 01:29:07 -04:00
parent f3a1e0b4fc 9a9e31b1b5
commit 7d23e773f3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-gadp/Module.manifest
+1 -1
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
Ghidra/Debug/Debugger-gadp/build.gradle
+12 -12
View File
@@ -33,33 +33,33 @@ configurations {
def platform = getCurrentPlatformName() def platform = getCurrentPlatformName()
dependencies { dependencies {
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:windows-x86_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:linux-x86_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:linux-aarch_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:osx-x86_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:osx-aarch_64@exe'
if (isCurrentWindows()) { 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 (isCurrentLinux()) {
if (platform.endsWith("x86_64")) { 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 { 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 (isCurrentMac()) {
if (platform.endsWith("x86_64")) { 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 { 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-AsyncComm')
api project(':Framework-Debugging') api project(':Framework-Debugging')
api project(':ProposedUtils') api project(':ProposedUtils')
@@ -70,7 +70,7 @@ dependencies {
/*protobuf { /*protobuf {
protoc { protoc {
artifact = 'com.google.protobuf:protoc:3.17.3' artifact = 'com.google.protobuf:protoc:3.21.6'
} }
}*/ }*/