+1462
-1175
lines changedFilter options
+1462
-1175
lines changed Original file line number Diff line number Diff line change
@@ -39,6 +39,17 @@ jobs:
39 39
with:
40 40
ref: ${{ inputs.safe-checkout }}
41 41 42 +
# rules_jvm_external doesn't support Java 8, which is the default version
43 +
# on some github runners. When this is selected, it results in some
44 +
# opaque errors about coursier (see
45 +
# https://github.com/bazel-contrib/rules_jvm_external/issues/1337).
46 +
- name: Pin to Java 11
47 +
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
48 +
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
49 +
with:
50 +
distribution: 'temurin'
51 +
java-version: '11'
52 + 42 53
- name: Windows startup flags
43 54
if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
44 55
working-directory: examples
@@ -92,16 +92,11 @@ crate.spec(
92 92
crate.from_specs()
93 93
use_repo(crate, crate_index = "crates")
94 94 95 -
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
96 -
maven.install(
95 +
protobuf_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
96 +
protobuf_maven.install(
97 97
name = "protobuf_maven",
98 98
artifacts = [
99 99
"com.google.caliper:caliper:1.0-beta-3",
100 -
"com.google.code.findbugs:jsr305:3.0.2",
101 -
"com.google.code.gson:gson:2.8.9",
102 -
"com.google.errorprone:error_prone_annotations:2.5.1",
103 -
"com.google.j2objc:j2objc-annotations:2.8",
104 -
"com.google.guava:guava:32.0.1-jre",
105 100
"com.google.guava:guava-testlib:32.0.1-jre",
106 101
"com.google.testparameterinjector:test-parameter-injector:1.18",
107 102
"com.google.truth:truth:1.1.2",
@@ -115,7 +110,24 @@ maven.install(
115 110
"https://repo.maven.apache.org/maven2",
116 111
],
117 112
)
118 -
use_repo(maven, "protobuf_maven")
113 +
use_repo(protobuf_maven, "protobuf_maven")
114 + 115 +
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
116 +
maven.install(
117 +
name = "maven",
118 +
artifacts = [
119 +
"com.google.code.findbugs:jsr305:3.0.2",
120 +
"com.google.code.gson:gson:2.8.9",
121 +
"com.google.errorprone:error_prone_annotations:2.5.1",
122 +
"com.google.j2objc:j2objc-annotations:2.8",
123 +
"com.google.guava:guava:32.0.1-jre",
124 +
],
125 +
repositories = [
126 +
"https://repo1.maven.org/maven2",
127 +
"https://repo.maven.apache.org/maven2",
128 +
],
129 +
)
130 +
use_repo(maven, "maven")
119 131 120 132
# Development dependencies
121 133
bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True)
@@ -65,7 +65,7 @@ rules_jvm_external_setup()
65 65
load("@rules_jvm_external//:defs.bzl", "maven_install")
66 66 67 67
maven_install(
68 -
name = "protobuf_maven",
68 +
name = "maven",
69 69
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
70 70
# For updating instructions, see:
71 71
# https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
@@ -76,10 +76,34 @@ maven_install(
76 76
],
77 77
)
78 78 79 -
load("@protobuf_maven//:defs.bzl", "pinned_maven_install")
80 - 79 +
load("@maven//:defs.bzl", "pinned_maven_install")
81 80
pinned_maven_install()
82 81 82 +
maven_install(
83 +
name = "protobuf_maven",
84 +
artifacts = [
85 +
"com.google.caliper:caliper:1.0-beta-3",
86 +
"com.google.guava:guava-testlib:32.0.1-jre",
87 +
"com.google.testparameterinjector:test-parameter-injector:1.18",
88 +
"com.google.truth:truth:1.1.2",
89 +
"junit:junit:4.13.2",
90 +
"org.mockito:mockito-core:4.3.1",
91 +
"biz.aQute.bnd:biz.aQute.bndlib:6.4.0",
92 +
"info.picocli:picocli:4.6.3",
93 +
],
94 +
# For updating instructions, see:
95 +
# https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
96 +
maven_install_json = "//:maven_dev_install.json",
97 +
repositories = [
98 +
"https://repo1.maven.org/maven2",
99 +
"https://repo.maven.apache.org/maven2",
100 +
],
101 +
)
102 + 103 +
load("@protobuf_maven//:defs.bzl", pinned_protobuf_maven_install = "pinned_maven_install")
104 +
pinned_protobuf_maven_install()
105 + 106 + 83 107
# For `cc_proto_blacklist_test` and `build_test`.
84 108
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
85 109
@@ -1,13 +1,13 @@
1 1
// See README.md for information and build instructions.
2 - 3 2
import com.example.tutorial.protos.AddressBook;
4 3
import com.example.tutorial.protos.Person;
4 +
import com.google.protobuf.util.Timestamps;
5 5
import java.io.BufferedReader;
6 6
import java.io.FileInputStream;
7 7
import java.io.FileNotFoundException;
8 8
import java.io.FileOutputStream;
9 -
import java.io.InputStreamReader;
10 9
import java.io.IOException;
10 +
import java.io.InputStreamReader;
11 11
import java.io.PrintStream;
12 12 13 13
class AddPerson {
@@ -51,6 +51,7 @@ static Person PromptForAddress(BufferedReader stdin,
51 51
}
52 52 53 53
person.addPhones(phoneNumber);
54 +
person.setLastUpdated(Timestamps.now());
54 55
}
55 56 56 57
return person.build();
@@ -74,7 +74,10 @@ java_binary(
74 74
name = "add_person_java",
75 75
srcs = ["AddPerson.java"],
76 76
main_class = "AddPerson",
77 -
deps = [":addressbook_java_proto"],
77 +
deps = [
78 +
":addressbook_java_proto",
79 +
"@com_google_protobuf//java/util",
80 +
],
78 81
)
79 82 80 83
java_binary(
@@ -112,7 +115,10 @@ java_binary(
112 115
name = "add_person_java_lite",
113 116
srcs = ["AddPerson.java"],
114 117
main_class = "AddPerson",
115 -
deps = [":addressbook_java_lite_proto"],
118 +
deps = [
119 +
":addressbook_java_lite_proto",
120 +
"@com_google_protobuf//java/util",
121 +
],
116 122
)
117 123 118 124
java_binary(
@@ -38,7 +38,7 @@ http_archive(
38 38
],
39 39
)
40 40 41 -
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
41 +
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps", "PROTOBUF_MAVEN_ARTIFACTS")
42 42 43 43
protobuf_deps()
44 44
@@ -59,3 +59,19 @@ load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolch
59 59
rules_cc_dependencies()
60 60 61 61
rules_cc_toolchains()
62 + 63 +
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
64 +
rules_jvm_external_deps()
65 + 66 +
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
67 +
rules_jvm_external_setup()
68 + 69 +
load("@rules_jvm_external//:defs.bzl", "maven_install")
70 +
maven_install(
71 +
name = "maven",
72 +
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
73 +
repositories = [
74 +
"https://repo1.maven.org/maven2",
75 +
"https://repo.maven.apache.org/maven2",
76 +
],
77 +
)
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@ java_library(
14 14
visibility = ["//visibility:public"],
15 15
deps = [
16 16
"//java/core",
17 -
"@protobuf_maven//:com_google_code_findbugs_jsr305",
18 -
"@protobuf_maven//:com_google_code_gson_gson",
19 -
"@protobuf_maven//:com_google_errorprone_error_prone_annotations",
20 -
"@protobuf_maven//:com_google_guava_guava",
21 -
"@protobuf_maven//:com_google_j2objc_j2objc_annotations",
17 +
"@maven//:com_google_code_findbugs_jsr305",
18 +
"@maven//:com_google_code_gson_gson",
19 +
"@maven//:com_google_errorprone_error_prone_annotations",
20 +
"@maven//:com_google_guava_guava",
21 +
"@maven//:com_google_j2objc_j2objc_annotations",
22 22
],
23 23
)
24 24 You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4