Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
xFile3160 committed Sep 2, 2024
2 parents 104e56c + bd9e022 commit de52506
Show file tree
Hide file tree
Showing 279 changed files with 6,763 additions and 33 deletions.
5 changes: 4 additions & 1 deletion .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ tasks:
name: ubuntu
platform: ubuntu2004
test_targets:
- "//..."
# NB: we must avoid //... because some modules contain BUILD files in overlays folders
# and those cannot be analyzed because their load() statements aren't functional here
- "//tools/..."
- "//:all"
2 changes: 1 addition & 1 deletion .bazelignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modules/
# NB: don't ignore the modules/ folder as it contains inputs to bazel test targets.
3 changes: 2 additions & 1 deletion metadata.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"properties": {
"github": {
"type": "string",
"description": "maintainer's github username"
"description": "maintainer's github username",
"pattern": "^[-a-zA-Z0-9]*$"
},
"email": {
"type": "string",
Expand Down
8 changes: 8 additions & 0 deletions modules/aexml/4.7.0/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module(
name = "aexml",
version = "4.7.0",
compatibility_level = 1,
)

bazel_dep(name = "rules_swift", version = "2.1.1")
bazel_dep(name = "apple_support", version = "1.16.0")
11 changes: 11 additions & 0 deletions modules/aexml/4.7.0/patches/add_build_file.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- /dev/null
+++ BUILD.bazel
@@ -0,0 +1,8 @@
+load("@rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+ name = "AEXML",
+ srcs = glob(["Sources/**/*.swift"]),
+ module_name = "AEXML",
+ visibility = ["//visibility:public"],
+)
11 changes: 11 additions & 0 deletions modules/aexml/4.7.0/patches/module_dot_bazel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- MODULE.bazel
+++ MODULE.bazel
@@ -0,0 +1,8 @@
+module(
+ name = "aexml",
+ version = "4.7.0",
+ compatibility_level = 1,
+)
+
+bazel_dep(name = "rules_swift", version = "2.1.1")
+bazel_dep(name = "apple_support", version = "1.16.0")
9 changes: 9 additions & 0 deletions modules/aexml/4.7.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
tasks:
verify_targets:
name: Verify build targets
bazel: 7.x
platform: macos
build_targets:
- '@aexml//:AEXML'
build_flags:
- "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"
10 changes: 10 additions & 0 deletions modules/aexml/4.7.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"url": "https://github.com/tadija/AEXML/archive/refs/tags/4.7.0.zip",
"integrity": "sha256-NylZt7S5lfmT0VjMvzXwafpjIqoaWDkgaml5VrmdW/A=",
"strip_prefix": "AEXML-4.7.0",
"patch_strip": 0,
"patches": {
"add_build_file.patch": "sha256-KBmlVSpnPd370G2MycgAWJR/cW9F0vTR5Apdeg322Mw=",
"module_dot_bazel.patch": "sha256-vGO5o5BNuRNGnT+OSJsIObsIC6HQytYtaH5GQmCy0DE="
}
}
17 changes: 17 additions & 0 deletions modules/aexml/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"homepage": "https://github.com/tadija/AEXML",
"maintainers": [
{
"email": "[email protected]",
"github": "ileitch",
"name": "Ian Leitch"
}
],
"repository": [
"github:tadija/AEXML"
],
"versions": [
"4.7.0"
],
"yanked_versions": {}
}
11 changes: 11 additions & 0 deletions modules/apple_rules_lint/0.4.0/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module(
name = "apple_rules_lint",
version = "0.4.0",
)

bazel_dep(name = "bazel_skylib", version = "1.7.1")

bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True, repo_name = "io_bazel_stardoc")

linter = use_extension("//lint:extensions.bzl", "linter")
use_repo(linter, "apple_linters")
36 changes: 36 additions & 0 deletions modules/apple_rules_lint/0.4.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
matrix:
platform:
- debian10
- ubuntu2004
- macos
- macos_arm64
bazel:
- 7.x
- 6.x
tasks:
verify_targets:
name: Verify build targets
platform: ${{ platform }}
bazel: ${{ bazel }}
build_targets:
- '@apple_rules_lint//lint:implementation'
bcr_test_module:
module_path: example
matrix:
platform:
- debian10
- ubuntu2004
- macos
- macos_arm64
bazel:
- 7.x
- 6.x
tasks:
run_test_module:
name: Run test module
platform: ${{ platform }}
bazel: ${{ bazel }}
build_targets:
- //...
test_targets:
- //...
5 changes: 5 additions & 0 deletions modules/apple_rules_lint/0.4.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://github.com/apple/apple_rules_lint/releases/download/0.4.0/apple_rules_lint-0.4.0.tar.gz",
"integrity": "sha256-SD6gPXPV+zMnXQKdqNNoESQ/wy36Tcc6Q6y7b0sa9iE=",
"strip_prefix": "apple_rules_lint-0.4.0"
}
10 changes: 8 additions & 2 deletions modules/apple_rules_lint/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,22 @@
"maintainers": [
{
"email": "[email protected]",
"github": "@shs96c",
"github": "shs96c",
"name": "Simon Stewart"
},
{
"email": "[email protected]",
"github": "gibfahn",
"name": "Gibson Fahnestock"
}
],
"repository": [
"github:apple/apple_rules_lint"
],
"versions": [
"0.2.0",
"0.3.2"
"0.3.2",
"0.4.0"
],
"yanked_versions": {}
}
38 changes: 38 additions & 0 deletions modules/asc_swift/1.0.0rc2/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
"""
A Swift library for accessing Apple's App Store Connect API and Enterprise Program API.
"""

module(
name = "asc_swift",
version = "1.0.0rc2",
)

bazel_dep(name = "apple_support", version = "1.16.0")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_apple", version = "3.8.0")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_swift", version = "2.1.1")

bazel_dep(name = "aspect_bazel_lib", version = "2.8.0", dev_dependency = True)
bazel_dep(name = "rules_multirun", version = "0.9.0", dev_dependency = True)

asc_swift_deps = use_extension("//bazel:extensions.bzl", "asc_swift_deps")
use_repo(
asc_swift_deps,
"com_github_apple_swift_crypto",
"com_github_createapi_urlqueryencoder",
)

asc_swift_dev_deps = use_extension("//bazel:extensions.bzl", "asc_swift_dev_deps", dev_dependency = True)
use_repo(
asc_swift_dev_deps,
"com_apple_app_store_connect_api",
"com_apple_enterprise_program_api",
"com_github_aaronsky_createapi",
"com_github_apple_swift_argument_parser",
"com_github_cosmo_grammaticalnumber",
"com_github_createapi_openapikit",
"com_github_createapi_yams",
"com_github_eonist_filewatcher",
"com_github_liamnichols_swift_configuration_parser",
)
14 changes: 14 additions & 0 deletions modules/asc_swift/1.0.0rc2/patches/module_dot_bazel_version.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
===================================================================
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -3,9 +3,9 @@
"""

module(
name = "asc_swift",
- version = "0.0.0",
+ version = "1.0.0rc2",
)

bazel_dep(name = "apple_support", version = "1.16.0")
bazel_dep(name = "platforms", version = "0.0.10")
31 changes: 31 additions & 0 deletions modules/asc_swift/1.0.0rc2/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
bcr_test_module:
module_path: Examples/bzlmod
matrix:
bazel:
- 7.x
tasks:
verify_targets_linux:
name: Verify Targets (Linux)
platform: ubuntu2004
bazel: ${{ bazel }}
environment:
CC: "clang"
SWIFT_VERSION: "5.9.2"
SWIFT_HOME: "$HOME/swift-5.9.2"
PATH: "$PATH:$HOME/swift-5.9.2/usr/bin"
shell_commands:
- "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
- "mkdir $SWIFT_HOME"
- "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
build_flags:
- "--action_env=PATH"
build_targets:
- "//..."
verify_targets_macos:
name: Verify Targets (macOS)
platform: macos
bazel: ${{ bazel }}
build_targets:
- "//..."
build_flags:
- "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"
9 changes: 9 additions & 0 deletions modules/asc_swift/1.0.0rc2/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-uRp8qOlJ1v+hCdxdXhZqHVzgB0cGkZXrKe1nE1H0WtU=",
"strip_prefix": "asc_swift-1.0.0rc2",
"url": "https://github.com/aaronsky/asc-swift/releases/download/1.0.0rc2/asc_swift-1.0.0rc2.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-5T/4F9EIQxbBChGIZEkXJ/3rq7c8pfqRwiLpBkAWt0A="
},
"patch_strip": 1
}
17 changes: 17 additions & 0 deletions modules/asc_swift/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"homepage": "https://github.com/aaronsky/asc-swift",
"maintainers": [
{
"name": "Aaron Sky",
"email": "[email protected]",
"github": "aaronsky"
}
],
"repository": [
"github:aaronsky/asc-swift"
],
"versions": [
"1.0.0rc2"
],
"yanked_versions": {}
}
8 changes: 8 additions & 0 deletions modules/asio/1.31.0/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module(
name = "asio",
version = "1.31.0",
compatibility_level = 1,
bazel_compatibility = [">=7.2.1"],
)
bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
bazel_dep(name = "rules_cc", version = "0.0.9")
17 changes: 17 additions & 0 deletions modules/asio/1.31.0/overlay/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
load("@rules_cc//cc:defs.bzl", "cc_library")

cc_library(
name = "asio",
srcs = [
"asio/src/asio.cpp",
"asio/src/asio_ssl.cpp",
],
hdrs = glob([
"asio/include/**/*.hpp",
"asio/include/**/*.ipp",
]),
includes = ["asio/include"],
local_defines = ["ASIO_SEPARATE_COMPILATION"],
visibility = ["//visibility:public"],
deps = ["@boringssl//:ssl"],
)
1 change: 1 addition & 0 deletions modules/asio/1.31.0/overlay/MODULE.bazel
15 changes: 15 additions & 0 deletions modules/asio/1.31.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
matrix:
platform:
- centos7
- debian10
- ubuntu2004
- macos
- windows
bazel: ["7.x"]
tasks:
verify_targets:
name: Verify build targets
bazel: ${{ bazel }}
platform: ${{ platform }}
build_targets:
- '@asio//:asio'
9 changes: 9 additions & 0 deletions modules/asio/1.31.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-UwVA+XNJjC0pd3GvG8hS9psnUJu7Vrx6wzCckoNzKG8=",
"strip_prefix": "asio-asio-1-31-0",
"url": "https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-31-0.tar.gz",
"overlay": {
"BUILD.bazel": "sha256-jiX3vWrmClACgLgJZlPVCVxAqa9OVmYrt7s1Oevhl/o=",
"MODULE.bazel": "sha256-bPRIetLzsv5bZ9ztvUvoYJrRd1IvP1sTen4E607nfgQ="
}
}
3 changes: 2 additions & 1 deletion modules/asio/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"versions": [
"1.21.0",
"1.24.0",
"1.28.2"
"1.28.2",
"1.31.0"
],
"yanked_versions": {}
}
32 changes: 32 additions & 0 deletions modules/aspect_rules_lint/1.0.0-rc10/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"Bazel dependencies"

module(
name = "aspect_rules_lint",
version = "1.0.0-rc10",
compatibility_level = 1,
)

bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")

# Needed in the root because we use js_lib_helpers in our aspect impl
# Minimum version needs 'chore: bump bazel-lib to 2.0 by @alexeagle in #1311'
# to allow users on bazel-lib 2.0
bazel_dep(name = "aspect_rules_js", version = "1.40.0")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "platforms", version = "0.0.7")
bazel_dep(name = "rules_multirun", version = "0.9.0")
bazel_dep(name = "rules_multitool", version = "0.4.0")

# Needed in the root because we dereference ProtoInfo in our aspect impl
bazel_dep(name = "rules_proto", version = "6.0.0")

# Needed in the root because we dereference the toolchain in our aspect impl
bazel_dep(name = "rules_buf", version = "0.1.1")
bazel_dep(name = "toolchains_protoc", version = "0.2.1")

multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
multitool.hub(lockfile = "//format:multitool.lock.json")
multitool.hub(lockfile = "//lint:multitool.lock.json")
use_repo(multitool, "multitool")

bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True, repo_name = "io_bazel_stardoc")
Loading

0 comments on commit de52506

Please sign in to comment.