Skip to content

Commit fad6d19

Browse files
committed
Update protobuf files for compatibility with latest version and fix Java version to 17
1 parent 2fe18e3 commit fad6d19

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ java {
7272
withSourcesJar()
7373
withJavadocJar()
7474

75-
sourceCompatibility = JavaVersion.VERSION_1_8
76-
targetCompatibility = JavaVersion.VERSION_1_8
75+
sourceCompatibility = JavaVersion.VERSION_17
76+
targetCompatibility = JavaVersion.VERSION_17
7777
}
7878

7979
ext {
@@ -87,6 +87,15 @@ protobuf {
8787
path = protocPath
8888
}
8989
}
90+
generateProtoTasks {
91+
all().each { task ->
92+
task.builtins {
93+
java {
94+
option 'lite'
95+
}
96+
}
97+
}
98+
}
9099
}
91100

92101
tasks.withType(JavaCompile) {

src/org/jlab/coda/xmsg/data/xMsgData.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* Department of Experimental Nuclear Physics, Jefferson Lab.
2121
*/
2222

23+
syntax = "proto2";
2324
option optimize_for = SPEED;
2425
option java_outer_classname = "xMsgD";
2526

@@ -52,7 +53,7 @@ message xMsgData {
5253
message xMsgPayload {
5354

5455
message Item {
55-
required string name =1; // payload name
56+
required string name = 1; // payload name
5657
required xMsgData data = 2; // data
5758
}
5859

src/org/jlab/coda/xmsg/data/xMsgMeta.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
* Department of Experimental Nuclear Physics, Jefferson Lab.
2121
*/
2222

23+
syntax = "proto2";
2324
option optimize_for = SPEED;
24-
2525
option java_outer_classname = "xMsgM";
2626

2727
package org.jlab.coda.xmsg.data;

0 commit comments

Comments
 (0)