Skip to content

Commit caf6ffe

Browse files
authored
Merge pull request #71 from aalyria/72FD82AC2B717D27606A1B35F96E5ADE
Project import generated by Copybara.
2 parents 487edf1 + 0162e5c commit caf6ffe

File tree

89 files changed

+5956
-2790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+5956
-2790
lines changed

.bazelrc

+4-52
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
##
16-
# Set C++20 as the standard version to use via BAZEL_CXXOPTS environment
17-
# variable, per:
18-
# - https://github.com/bazelbuild/bazel/blob/master/tools/cpp/unix_cc_configure.bzl
19-
#
20-
# For information on C/C++ compiler warnings see:
21-
# - https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
22-
#
23-
# TODO: remove -Wno-deprecated-declarations and live a healthier, happier life.
24-
#
25-
# TODO: remove
26-
# -Wno-sign-compare (https://github.com/protocolbuffers/protobuf/issues/12432)
27-
# when protobuf builds without it.
28-
#
29-
# TODO: remove
30-
# -Wno-comment
31-
# -Wno-class-memaccess
32-
# -Wno-unused-variable
33-
# -Wno-unused-function
34-
# when grpc builds without them.
35-
#
36-
# TODO: remove the -Wno-stringop-overflow flag once we upgrade our
37-
# protobuf dep past v3.22.0~ish
38-
# See: https://github.com/protocolbuffers/protobuf/commit/887daf693fa17d7baf7b55b278132a7115beae30
39-
# See: https://github.com/protocolbuffers/protobuf/issues/6419
40-
##
41-
build --action_env=BAZEL_CXXOPTS='-std=c++20:-Wall:-Werror:-Wno-deprecated-declarations:-Wno-sign-compare:-Wno-comment:-Wno-class-memaccess:-Wno-unused-variable:-Wno-unused-function:-Wno-stringop-overflow'
42-
build --features=external_include_paths
43-
44-
# Go 1.20 introduced some changes that can cause unnecessary rebuilds without
45-
# this flag: See https://github.com/bazelbuild/rules_go/issues/3430.
46-
build --experimental_output_directory_naming_scheme=diff_against_baseline
47-
48-
##
49-
# Don't automatically create __init__.py files in the runfiles of
50-
# Python targets.
51-
# See: https://github.com/bazelbuild/bazel/issues/10076
52-
#
53-
# This is motivated by our python proto library targets which produce
54-
# overlapping import paths.
55-
##
56-
build --incompatible_default_to_explicit_init_py
57-
58-
##
59-
# Enable hermetic testing and compilation of Java using a JVM downloaded from a
60-
# remote repository.
61-
##
62-
build --tool_java_runtime_version=remotejdk_17 --java_runtime_version=remotejdk_17
15+
import %workspace%/common.bazelrc
6316

64-
##
65-
# Allow Java constructs compatible with the Java 17 specification.
66-
##
67-
build --tool_java_language_version=17 --java_language_version=17
17+
# Enable bzlmod, which is the new system of managing external dependencies
18+
# using a MODULE.bazel file instead of the legacy WORKSPACE system.
19+
common --enable_bzlmod

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.2.1
1+
7.0.0

MODULE.bazel

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Copyright 2023 Aalyria Technologies, Inc., and its affiliates.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
module(name = "aalyria_api")
16+
17+
# NOTE: keep this version aligned with the (duplicated declaration) of
18+
# @com_google_protobuf repo present in the WORKSPACE file. While most
19+
# first-level dependencies in WORKSPACE depend on @com_google_protobuf, when
20+
# the build executes on bazel 7 something is also referencing @protobuf, which
21+
# if not overridden in MODULE.bazel (like below) defaults to @protobuf~3.19
22+
# included in the bazel distribution itself.
23+
bazel_dep(
24+
name = "protobuf",
25+
version = "23.1",
26+
)
27+
bazel_dep(name = "abseil-cpp", version = "20230802.0.bcr.1", repo_name = "com_google_absl")
28+
bazel_dep(name = "aspect_bazel_lib", version = "2.1.0")
29+
bazel_dep(name = "bazel_skylib", version = "1.5.0")
30+
bazel_dep(name = "platforms", version = "0.0.8")
31+
bazel_dep(name = "re2", version = "2023-09-01", repo_name = "com_google_re2")
32+
bazel_dep(name = "rules_cc", version = "0.0.9")
33+
bazel_dep(name = "rules_oci", version = "1.5.1")
34+
bazel_dep(name = "rules_pkg", version = "0.9.1")
35+
bazel_dep(name = "rules_go", version = "0.46.0")
36+
bazel_dep(name = "gazelle", version = "0.35.0")
37+
38+
bazel_dep(name = "container_structure_test", version = "1.16.0", dev_dependency = True)
39+
40+
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
41+
go_sdk.download(version = "1.22.1")
42+
43+
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
44+
oci.pull(
45+
name = "alpine_base",
46+
digest = "sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300",
47+
image = "docker.io/library/alpine",
48+
#tag = "3.15.0",
49+
platforms = ["linux/amd64"],
50+
)
51+
use_repo(oci, "alpine_base")

0 commit comments

Comments
 (0)