mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-5456: Upgrade protobuf to 4.31.0 (java) and 6.31.0 (python)

Browse Source
This commit is contained in:
Dan
2025-06-02 14:49:12 +00:00
parent b22ccaa260
commit f1607b5cfd
16 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gradle/hasProtobuf.gradle
View File

@@ -24,38 +24,40 @@ configurations {
def platform = getCurrentPlatformName()
def version = getProperty('ghidra.protobuf.java.version')
dependencies {
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
allProtocArtifacts "com.google.protobuf:protoc:${version}:windows-x86_64@exe"
allProtocArtifacts "com.google.protobuf:protoc:${version}:linux-x86_64@exe"
allProtocArtifacts "com.google.protobuf:protoc:${version}:linux-aarch_64@exe"
allProtocArtifacts "com.google.protobuf:protoc:${version}:osx-x86_64@exe"
allProtocArtifacts "com.google.protobuf:protoc:${version}:osx-aarch_64@exe"
if (isCurrentWindows()) {
protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
protocArtifact "com.google.protobuf:protoc:${version}:windows-x86_64@exe"
}
if (isCurrentLinux()) {
if (platform.endsWith("x86_64")) {
protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
protocArtifact "com.google.protobuf:protoc:${version}:linux-x86_64@exe"
}
else {
protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
protocArtifact "com.google.protobuf:protoc:${version}:linux-aarch_64@exe"
}
}
if (isCurrentMac()) {
if (platform.endsWith("x86_64")) {
protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
protocArtifact "com.google.protobuf:protoc:${version}:osx-x86_64@exe"
}
else {
protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
protocArtifact "com.google.protobuf:protoc:${version}:osx-aarch_64@exe"
}
}
}
/*protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.21.8'
artifact = 'com.google.protobuf:protoc:${version}'
}
}*/

6
gradle/support/fetchDependencies.gradle
View File

@@ -164,9 +164,9 @@ ext.deps = [
destination: FID_DIR
],
[
name: "protobuf-3.20.3-py2.py3-none-any.whl",
url: "https://files.pythonhosted.org/packages/8d/14/619e24a4c70df2901e1f4dbc50a6291eb63a759172558df326347dce1f0d/protobuf-3.20.3-py2.py3-none-any.whl",
sha256: "a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db",
name: "protobuf-6.31.0-py3-none-any.whl",
url: "https://files.pythonhosted.org/packages/ee/01/1ed1d482960a5718fd99c82f6d79120181947cfd4667ec3944d448ed44a3/protobuf-6.31.0-py3-none-any.whl",
sha256: "6ac2e82556e822c17a8d23aa1190bbc1d06efb9c261981da95c71c9da09e9e23",
destination: file("${DEPS_DIR}/Debugger-rmi-trace/")
],
[