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

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

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