diff --git a/.bazelversion b/.bazelversion index 6aba2b2..c7cb131 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -4.2.0 +5.3.1 diff --git a/WORKSPACE b/WORKSPACE index 34f8379..4c549bc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -45,6 +45,22 @@ http_archive( urls = ["https://github.com/grpc/grpc/archive/v%s.zip" % GRPC_VERSION], ) +http_archive( + name = "com_github_grpc_grpc_web", + strip_prefix = "grpc-web-b0ea9c7c45d6f9ea5338fc61a81b47f589a91259", + sha256 = "a7ae33e32b95049f11373b62019b742464576a17c602fa6b2457926749d58a1c", + urls = ["https://github.com/grpc/grpc-web/archive/b0ea9c7c45d6f9ea5338fc61a81b47f589a91259.tar.gz"], +) + +http_archive( + name = "io_bazel_rules_go", + sha256 = "099a9fb96a376ccbbb7d291ed4ecbdfd42f6bc822ab77ae6f1b5cb9e914e94fa", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.35.0/rules_go-v0.35.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.35.0/rules_go-v0.35.0.zip", + ], +) + http_archive( name = "io_grpc_proto", sha256 = "f081eba5884bf09051d27664aede4fc22bbaa77da477735d745bcef17bd088f1", @@ -94,7 +110,6 @@ buildbuddy_deps() load("@io_buildbuddy_buildbuddy_toolchain//:rules.bzl", "buildbuddy") buildbuddy(name = "buildbuddy_toolchain") - load("@gust//defs:build.bzl", "install_dependencies") load("@//config:build.bzl", app_dependencies = "install_dependencies") load("@gust//defs:config.bzl", "CHROMIUM", "FIREFOX", "SAUCE", "GRAALVM_VERSION", "GRAALVM_JDK_VERSION", "K8S_VERSION") @@ -117,7 +132,7 @@ switched_rules_by_language( java = True, nodejs = False, php = False, - python = True, + python = False, ruby = False, ) @@ -149,6 +164,15 @@ rules_proto_dependencies() rules_proto_toolchains() +# +# Go +# +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") + +go_rules_dependencies() +go_register_toolchains(version = "1.19.1") +gazelle_dependencies() # # Extensions @@ -168,8 +192,8 @@ http_archive( ## NodeJS http_archive( name = "build_bazel_rules_nodejs", - sha256 = "8a7c981217239085f78acc9898a1f7ba99af887c1996ceb3b4504655383a2c3c", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0/rules_nodejs-4.0.0.tar.gz"], + sha256 = "c911b5bd8aee8b0498cc387cacdb5f917098ce477fb4182db07b0ef8a9e045c0", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.7.1/rules_nodejs-4.7.1.tar.gz"], ) load( @@ -386,14 +410,6 @@ stardoc_repositories() load("@build_stack_rules_proto//swift:deps.bzl", "swift_proto_library") swift_proto_library() -## Go -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") - -go_rules_dependencies() -go_register_toolchains() -gazelle_dependencies() - ## Protoc-Gen-Doc load("@protoc_gen_doc//defs:deps.bzl", protoc_gen_doc_dependencies="go_dependencies") protoc_gen_doc_dependencies() @@ -426,11 +442,11 @@ npm_bazel_labs_dependencies() ## JarJar load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") -git_repository( +http_archive( name = "com_github_johnynek_bazel_jar_jar", - shallow_since = "1594234634 -1000", - commit = "171f268569384c57c19474b04aebe574d85fde0d", - remote = "git://github.com/johnynek/bazel_jar_jar.git", + sha256 = "97c5f862482a05f385bd8f9d28a9bbf684b0cf3fae93112ee96f3fb04d34b193", + strip_prefix = "bazel_jar_jar-171f268569384c57c19474b04aebe574d85fde0d", + urls = ["https://github.com/OpenCannabis/bazel_jar_jar/archive/171f268569384c57c19474b04aebe574d85fde0d.tar.gz"], ) load( @@ -438,3 +454,4 @@ load( "jar_jar_repositories", ) jar_jar_repositories() + diff --git a/config/versions.bzl b/config/versions.bzl index e980e2c..813d8c5 100644 --- a/config/versions.bzl +++ b/config/versions.bzl @@ -1,5 +1,6 @@ PROTOBUF_VERSION = "3.15.3" GRPC_VERSION = "1.38.1" -NODE_VERSION = "14.15.0" -YARN_VERSION = "1.22.4" +NODE_VERSION = "17.4.0" +YARN_VERSION = "1.22.17" + diff --git a/opencannabis/BUILD.bazel b/opencannabis/BUILD.bazel index b73c6bd..2565926 100644 --- a/opencannabis/BUILD.bazel +++ b/opencannabis/BUILD.bazel @@ -80,28 +80,29 @@ pkg_tar( srcs = ["//opencannabis/%s:%s-doc" % (n, n) for n in MODULES if n not in DOC_SKIP], ) -buf_image( - name = "image_bin", - out = "OpenCannabis.buf.bin", - config = "//:buf.yaml", - protos = [ - ":OpenCannabis", - ], -) - -buf_image( - name = "image_json", - out = "OpenCannabis.buf.json", - config = "//:buf.yaml", - protos = [ - ":OpenCannabis", - ], - extra_args = [ - "--log-level=debug", - ], -) +#buf_image( +# name = "image_bin", +# out = "OpenCannabis.buf.bin", +# config = "//:buf.yaml", +# protos = [ +# ":OpenCannabis", +# ], +#) + +#buf_image( +# name = "image_json", +# out = "OpenCannabis.buf.json", +# config = "//:buf.yaml", +# protos = [ +# ":OpenCannabis", +# ], +# extra_args = [ +# "--log-level=debug", +# ], +#) + +#alias( +# name = "image", +# actual = ":image_bin", +#) -alias( - name = "image", - actual = ":image_bin", -) diff --git a/package.json b/package.json index 08ffb16..77d9cfb 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ }, "devDependencies": { "@bazel/bazelisk": "1.10.1", - "@bazel/jasmine": "4.0.0", - "@bazel/labs": "4.0.0", - "@bazel/rollup": "4.0.0", + "@bazel/jasmine": "4.6.2", + "@bazel/labs": "4.6.2", + "@bazel/rollup": "4.6.2", "@bazel/source-map-support": "latest", - "@bazel/terser": "4.0.0", - "@bazel/typescript": "4.0.0", - "@bazel/worker": "4.0.0", + "@bazel/terser": "4.6.2", + "@bazel/typescript": "4.6.2", + "@bazel/worker": "4.6.2", "jasmine": "3.9.0", "jasmine-core": "3.9.0", "rollup": "2.56.3", diff --git a/tools/bazel.rc b/tools/bazel.rc index 3543ffb..4ebfc15 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -9,7 +9,6 @@ # Base Settings ## -run --incompatible_restrict_string_escapes=false run --incompatible_strict_action_env run --workspace_status_command=./tools/bazel_stamp_vars.sh @@ -19,9 +18,9 @@ build --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 build --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 build --protocopt=--experimental_allow_proto3_optional +build --incompatible_java_common_parameters=false build --strategy=sandboxed build --enable_platform_specific_config -build --incompatible_restrict_string_escapes=false build --watchfs build --symlink_prefix=dist/ build --nolegacy_external_runfiles @@ -63,7 +62,6 @@ build --ios_simulator_version=14.2 build --ios_simulator_device="iPhone 12 Pro" build --apple_generate_dsym=true build --apple_bitcode=embedded -build --enable_apple_binary_native_protos=true ## # Development diff --git a/yarn.lock b/yarn.lock index 9edca67..f37d2b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,23 +7,25 @@ resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.10.1.tgz#46236a43ad58e310c55247f866da0dc6083c3d8b" integrity sha512-IHszNzBO2UrUy6YtsSAsZtnU6I6qpzXGkWdEvGoMxLgJnDsEnsIYniDCUjvjU1KAP+A03eepmCHlyFcRHMSxRA== -"@bazel/jasmine@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-4.0.0.tgz#2e95f1b3458e0d69f16e0c820fe4631a43942a90" - integrity sha512-vi1n+vbLwKki7aa8kXDG709nxRXAmLEvqbijSpm8d3rrW4f68Ad5xKyT2gezO84OeysUHU3cDZViXWwFcoHRng== +"@bazel/jasmine@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/@bazel/jasmine/-/jasmine-4.6.2.tgz#0cda13b88b62345ea0f3a52b24b903b29e90a4cd" + integrity sha512-T5YOIy800khE+NXf0IsV1KcQjPjppf9CzSBe68LluFg+cgnF59GHn9qnlz4Ml9/L6bx5TQxG3yWbWY/jiAwziQ== dependencies: c8 "~7.5.0" - jasmine-reporters "~2.4.0" + jasmine-reporters "~2.5.0" -"@bazel/labs@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@bazel/labs/-/labs-4.0.0.tgz#55d950342e59c902aa8cb2268b3978e0218cfac7" - integrity sha512-jmSgUoqJn/0zYMUsP8jg1MPbChAOda2UEToHtFdKpNZxkYJ2l2sNgDf2tujl6jM8Mw42jeV6PU+GqKXowjgwAQ== +"@bazel/labs@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/@bazel/labs/-/labs-4.6.2.tgz#7efb40bb528d2b182fafe2003a63b91d992f7c43" + integrity sha512-9WIfp+MsbMv3Ae6uirKjHm7cGKEXUTYJzwPtsUb+ZQqDjpzHapUrBQAzeUrj7g3yl8HYV/Ru/WMSFwVuaDMHfQ== -"@bazel/rollup@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-4.0.0.tgz#909cfa9bd0243fd78657711b3aa644b8432ba636" - integrity sha512-OcL7QtNk2nyN/v7fnih0VQ0pIDwSxdGkyZvt/m1SwODx/eJpBceam0yboLoer/sYEZPhv7YFyCTk9n2X64TZ5g== +"@bazel/rollup@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/@bazel/rollup/-/rollup-4.6.2.tgz#7472a9bd4235c1d635f5f32682aac984ca9d95b4" + integrity sha512-QlEFdhzKwF40sDk6OfF6uE3za5YKAjbt/kO0Zz8fVmhQUv289lQ3cIf2MsbiUasWpQHJ4CBwWXOb4/hrVQypcw== + dependencies: + "@bazel/worker" "4.6.2" "@bazel/source-map-support@latest": version "0.5.9-c" @@ -33,27 +35,28 @@ buffer-from "^1.0.0" source-map "^0.6.0" -"@bazel/terser@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-4.0.0.tgz#9ef0c4635ba0191965f0b6c26eb0cc348c8c1f5e" - integrity sha512-sktDTfEBFD6LIv+g7W0l9nt5pih7N7aQVA09lv09rbTWD/JGX1LSSjG2p16af297XMxCP6GoHyVaxOVXS3IPYA== +"@bazel/terser@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/@bazel/terser/-/terser-4.6.2.tgz#d9d03c2dadca14b2d0ee399f5d81c41f5770f66a" + integrity sha512-3e4qJ7euVGvArMLdZa9+Gux7XotPEbSGgYnNbWHen7kRJf6jetNPbSd+BTFMAiXXmG+J9U7e/U+l8lUe3eW0Ag== -"@bazel/typescript@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.0.0.tgz#71a6f0f5e340c6b8516b21fbc0f0853e74055d0c" - integrity sha512-+Le9q+5IR9gEnSH8sXyxDB5dD6NJx2kbm6AL+cijYVat2MczpGV4sI1mu0mdLzYsEX5Tjt5iHkaNb7sFESjnYA== +"@bazel/typescript@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/@bazel/typescript/-/typescript-4.6.2.tgz#9f07b6f8cfb6b0a0e228e5971de412911c910a90" + integrity sha512-AUF7kq82bP6DX9Brihr/eQqvNccxVfSXosFxt80h94og5cmMyoc/euXha6rxlOBP3yWXmSo+/qjzO7o8PWJduQ== dependencies: + "@bazel/worker" "4.6.2" protobufjs "6.8.8" semver "5.6.0" source-map-support "0.5.9" - tsutils "2.27.2" + tsutils "3.21.0" -"@bazel/worker@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-4.0.0.tgz#75ea55f1392f203294151c1bced9b1de017c8c11" - integrity sha512-YkATESfezmCWjHYkh2URyJKG25Ps05G4U+QJA76K6ANlGKwYL4J5MbWed0FuRIx/a+0B+bgAFO0BgmcortoZow== +"@bazel/worker@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/@bazel/worker/-/worker-4.6.2.tgz#0bd105344533335327c2edfa3fc65b04c39cdea8" + integrity sha512-DLpN6iQAH6uiUraAs4CESyqs60u55fcKmYgOOVObGuLSQQuX49Lw7XRIN90NibRPwpbBDQichWE3zfra0yKTTw== dependencies: - protobufjs "6.8.8" + google-protobuf "^3.6.1" "@bcoe/v8-coverage@^0.2.3": version "0.2.3" @@ -138,10 +141,15 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== +"@xmldom/xmldom@^0.7.3": + version "0.7.5" + resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" + integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== + ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^4.0.0: version "4.3.0" @@ -295,6 +303,11 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +google-protobuf@^3.6.1: + version "3.21.2" + resolved "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz#4580a2bea8bbb291ee579d1fefb14d6fa3070ea4" + integrity sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA== + has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -360,13 +373,13 @@ jasmine-core@3.9.0, jasmine-core@~3.9.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.9.0.tgz#09a3c8169fe98ec69440476d04a0e4cb4d59e452" integrity sha512-Tv3kVbPCGVrjsnHBZ38NsPU3sDOtNa0XmbG2baiyJqdb5/SPpDO6GVwJYtUryl6KB4q1Ssckwg612ES9Z0dreQ== -jasmine-reporters@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jasmine-reporters/-/jasmine-reporters-2.4.0.tgz#708c17ae70ba6671e3a930bb1b202aab80a31409" - integrity sha512-jxONSrBLN1vz/8zCx5YNWQSS8iyDAlXQ5yk1LuqITe4C6iXCDx5u6Q0jfNtkKhL4qLZPe69fL+AWvXFt9/x38w== +jasmine-reporters@~2.5.0: + version "2.5.0" + resolved "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-2.5.0.tgz#f9e2e0f82aaa2e07e8d553be56457efe0fd8b39e" + integrity sha512-J69peyTR8j6SzvIPP6aO1Y00wwCqXuIvhwTYvE/di14roCf6X3wDZ4/cKGZ2fGgufjhP2FKjpgrUIKjwau4e/Q== dependencies: - mkdirp "^0.5.1" - xmldom "^0.5.0" + "@xmldom/xmldom" "^0.7.3" + mkdirp "^1.0.4" jasmine@3.9.0: version "3.9.0" @@ -402,17 +415,10 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" +mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== once@^1.3.0: version "1.4.0" @@ -592,10 +598,10 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tsutils@2.27.2: - version "2.27.2" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7" - integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg== +tsutils@3.21.0: + version "3.21.0" + resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" @@ -634,11 +640,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xmldom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"