Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ build --features=swift.debug_prefix_map
build --host_force_python=PY3
build --ios_minimum_os=11.0
build --ios_simulator_device="iPhone 13"
build --ios_simulator_version=15.0
build --ios_simulator_version=15.2
build --spawn_strategy=local
build --verbose_failures
build --workspace_status_command=envoy/bazel/get_workspace_status
build --xcode_version=13.0
build --xcode_version=13.2.1
build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
build --javabase=@bazel_tools//tools/jdk:remote_jdk11
build --tool_java_runtime_version=remotejdk_11
Expand Down
20 changes: 10 additions & 10 deletions ci/BUILD
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
licenses(["notice"]) # Apache 2

xcode_version(
name = "xcode_13_0",
default_ios_sdk_version = "15.0",
default_macos_sdk_version = "11.3",
default_tvos_sdk_version = "15.0",
default_watchos_sdk_version = "7.4",
version = "13.0",
name = "xcode_13_2_1",
default_ios_sdk_version = "15.2",
default_macos_sdk_version = "12.1",
default_tvos_sdk_version = "15.2",
default_watchos_sdk_version = "8.3",
version = "13.2.1",
)

available_xcodes(
name = "local_xcodes",
default = ":xcode_13_0",
default = ":xcode_13_2_1",
versions = [
":xcode_13_0",
":xcode_13_2_1",
],
)

available_xcodes(
name = "remote_xcodes",
default = ":xcode_13_0",
default = ":xcode_13_2_1",
versions = [
":xcode_13_0",
":xcode_13_2_1",
],
)

Expand Down
2 changes: 1 addition & 1 deletion ci/mac_ci_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fi

pip3 install slackclient
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
sudo xcode-select --switch /Applications/Xcode_13.0.app
sudo xcode-select --switch /Applications/Xcode_13.2.1.app

# Download and set up ndk 21. Github upgraded to ndk 22 for their Mac image.
ANDROID_HOME=$ANDROID_SDK_ROOT
Expand Down
3 changes: 2 additions & 1 deletion docs/root/start/building/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ See `ci/mac_ci_setup.sh` for the specific NDK version used during builds.
iOS requirements
----------------

- Xcode 13.0
- Xcode 13.2.1
- iOS 11.0 or later
- Note: Requirements are listed in the :repo:`.bazelrc file <.bazelrc>` and CI scripts

.. _android_aar:
Expand Down