blob: d853d6cc32253a7e16ff7a8153522c9b9937bddd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
--- ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
+++ ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
@@ -1 +1 @@
-MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
+MODULE FILE LICENSE: lib/protobuf-java-3.24.3.jar BSD-3-GOOGLE
--- ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
+++ ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
@@ -22,7 +22,7 @@
eclipse.project.name = 'Debug Framework-AsyncComm'
dependencies {
- api 'com.google.protobuf:protobuf-java:3.21.8'
+ api 'com.google.protobuf:protobuf-java:3.24.3'
api project(':Generic')
api project(':Graph')
api project(':ProposedUtils')
--- ghidra-10.4/ghidra_build/gradle/hasProtobuf.gradle
+++ ghidra-10.4/ghidra_build/gradle/hasProtobuf.gradle
@@ -26,36 +26,36 @@
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:3.24.3:windows-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:linux-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:linux-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:osx-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:osx-aarch_64@exe'
if (isCurrentWindows()) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.24.3: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:3.24.3:linux-x86_64@exe'
}
else {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.24.3: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:3.24.3:osx-x86_64@exe'
}
else {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.24.3:osx-aarch_64@exe'
}
}
}
/*protobuf {
protoc {
- artifact = 'com.google.protobuf:protoc:3.21.8'
+ artifact = 'com.google.protobuf:protoc:3.24.3'
}
}*/
@@ -74,7 +74,7 @@
exe.setExecutable(true)
}
exec {
- commandLine exe, "--java_out=$outdir", "-I$srcdir"
+ commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir"
args src
}
}
|