Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Update to build with Xcode 13.4.1 #369

Merged
merged 1 commit into from
Oct 14, 2022

Conversation

thii
Copy link
Member

@thii thii commented Oct 4, 2022

PiperOrigin-RevId: 468022196
(cherry picked from commit d8c299b)

thii referenced this pull request Oct 4, 2022
PiperOrigin-RevId: 468022196
@thii thii force-pushed the thi/update-to-build-with-xcode-13.4.1 branch from 34719f3 to a150eea Compare October 12, 2022 11:54
thii added a commit to thii/tulsi that referenced this pull request Oct 13, 2022
The workflows reference the master branch so has to be done before
bazelbuild#369.
thii added a commit to thii/tulsi that referenced this pull request Oct 13, 2022
The workflows reference the master branch so has to be done before
bazelbuild#369.
thii added a commit that referenced this pull request Oct 13, 2022
The workflows reference the master branch so has to be done before
#369.
@thii thii force-pushed the thi/update-to-build-with-xcode-13.4.1 branch from 4613689 to a86407c Compare October 13, 2022 04:06
@thii thii marked this pull request as ready for review October 13, 2022 06:06
@thii thii enabled auto-merge (rebase) October 13, 2022 08:46
wendyliga added a commit to wendyliga/tulsi-plus-plus that referenced this pull request Oct 13, 2022
* Fix broken external BuildLabel filename parsing (#257)

External BuildLabels were keeping their // halfway through their path, leading to projects xcode would refuse to load.

As an example: @google_toolbox_for_mac//Foundation:BUILD was going to external//Foundation/BUILD, not external/Foundation/BUILD.
This lead the pbjproj to assign the file the path //Foundation/BUILD, which Xcode refuses to load, along with groups named '/' and the omission of other associated source files.

* Add support for ios_sim_arm64 CPU type

* Point External Paths into Stable External Directory instead of Unstable Execroot (#255)

* Fix breaking of external workspaces after builds

Previously, paths to files in external workspaces went through execroot.
Execroot is reconfigured on every rebuild to contain only the external
workspaces (and top-level packages) required by that build. Therefore,
executing a build that used a subset of the project's external
workspaces broke the file references and include paths for the other
external workspaces. Bad times.

This commit points to external workspaces through the stable external
subdirectory of output_base instead of the unstable external subdir
of execroot. This requires a new tulsi symlink for output base; Xcode
doesn't properly resolve ../ paths through symlinks for file references.
Plus, we should probably try to move away from linking through a
temporary build sandbox anyway; it'll just keep leading to subtle bugs.

This should close bazelbuild/tulsi#164
This patches bazelbuild/tulsi#227 and
bazelbuild/tulsi#229.

This commit also contains a fix for an (I think unreported) bug I
noticed while editing ProjectPatcher. In trying to fix paths for files
not on disk, it was unintentionally setting their paths to (an
incorrect) path that was group relative, but meant to be project
relative. It also created inconsistent state in the PBGroup hierarchy.
Since this fixes the paths for generated Info.plists in most projects,
it leads to many of the file ref path changes in the tests. The code
now does what the author clearly intended, and I've added some defence
against future issues into PBXObjects.

* Make execroot symlink's names reflect what it is

tulsi-workspace -> tulsi-execution-root
TULSI_BWRS -> TULSI_EXECUTION_ROOT

* Re-add legacy names for execroot build setting and symlink for backwards compatibility

Fixes bazelbuild/tulsi#164.

* Add `generates_header = True` to `swift_library` targets used by Tulsi's E2E tests.

PiperOrigin-RevId: 367058875
(cherry picked from commit debe5ac)

* Add a setting to the Tulsi-generated lldbinit to explicitly enable implicit module maps. LLDB will transitively include an option that disables implicit module maps when importing a Swift module that depends on an Objective-C library that was built with explicit modules. Depending on the build graph, this can mean LLDB's clang module importer can fail to find the required module maps and provide no debug info.

PiperOrigin-RevId: 371927956
(cherry picked from commit dbb0fc4)

* Updates version number to 0.4.372144887.20210505.

PiperOrigin-RevId: 372147605
(cherry picked from commit 5ef399c)

* Internal Change

PiperOrigin-RevId: 373199701
(cherry picked from commit 9939243)

* Only show one amibigous rule warning per build label.

PiperOrigin-RevId: 374475916
(cherry picked from commit ee965f2)

* Updates version number to 0.4.374474001.20210518.

PiperOrigin-RevId: 374489201
(cherry picked from commit 21cc1c8)

* Change 1/3 to add a new tool that handles pruning the LLDB module cache of any modules that are found in a metadata file that is intended to be created by a bazel aspect that collects explicit module build outputs. This tool is needed to avoid a crash with LLDB that occurs when the LLDB module cache contains a module that is also generated in a build as an explicit module.

This chnage handles reading metadata files that a bazel aspect will write to come up with a list of names of all explicit modules that will have been created from a build.

PiperOrigin-RevId: 378248354
(cherry picked from commit 078e311)

* Change 2/3 to add a new tool that handles pruning the LLDB module cache of any modules that are found in a metadata file that is intended to be created by a bazel aspect that collects explicit module build outputs. This tool is needed to avoid a crash with LLDB that occurs when the LLDB module cache contains a module that is also generated in a build as an explicit module.

This change handles reading the contents of the implicit module cache and map the name of each module to the absolute path of that module.

PiperOrigin-RevId: 378402314
(cherry picked from commit a03f6ef)

* Change 3/3 to add a new tool that handles pruning the LLDB module cache of any modules that are found in a metadata file that is intended to be created by a bazel aspect that collects explicit module build outputs. This tool is needed to avoid a crash with LLDB that occurs when the LLDB module cache contains a module that is also generated in a build as an explicit module.

To summarize how this works:
 - Read the contents of the implicit module cache and map the name of each module to the absolute path of that module.
 - Read metadata files that a bazel aspect will write to come up with a list of names of all explicit modules created from a build.
 - Iterate through the list of explicit module names and delete any module with the same name from the implicit module cache.
 - Compute a hash of the list of explicit module names that were used to prune the implicit module cache.
 - Save that hash to a special sentinel file in the implicit module cache.
 - Compare the hash of subsequent builds to the one in the file to determine if subsequent builds should prune the implicit module cache.

PiperOrigin-RevId: 378666180
(cherry picked from commit 55b6a92)

* Disable legacy build system error in Xcode 13

Disable this as it can annoy users; we're working on new build system support.

PiperOrigin-RevId: 378916679
(cherry picked from commit 3f25dd7)

* Removing this ios_static_framework target that isn't covered by any tests.

Tulsi doesn't allow list ios_static_framework rules, so the e2e test appears to ignore this target.

PiperOrigin-RevId: 378933587
(cherry picked from commit 31da848)

* Revert "Point External Paths into Stable External Directory instead of Unstable Execroot (#255)"

This reverts commit c7609aa.

* Prevent a crash in lldb-rpc-server that can occur after migrating a rule in the build graph to use Swift explicit modules.
  - Updates the Tulsi outputs aspect to output the Swift explicit modules generated from a build.
  - Bundles the module cache pruning tool with the Tulsi app bundle and installs it to the same location as the bazel_cache_reader.
  - Runs the module cache pruning tool after each Tulsi build, providing the output from the aspect, to prevent lldb from loading the outdated implicit module.

PiperOrigin-RevId: 378936605
(cherry picked from commit 98d6f25)

* Updates version number to 0.4.374498161.20210614.

Significant changes:
- Fixed a crash with lldb-rpc-server that can occur after
  migrating a rule to use Swift explicit modules.

PiperOrigin-RevId: 379284179
(cherry picked from commit e4fcc3c)

* Add @discardableResult to pruneModuleCache function so we can avoid needing to explicitly drop the return value when not using it.

PiperOrigin-RevId: 382075141
(cherry picked from commit 552b356)

* Move entitlements handling into the rule implementations.

This allows us to remove the special internal entitlements rule and convert nearly all of the existing macro-wrapped rules into pure rules, with the exception of some macOS rules which still have some straggling items to migrate.

PiperOrigin-RevId: 382347912
(cherry picked from commit 286d21b)

* Move usage of bazel_cache_reader behind a Tulsi option and leave it disabled by default. bazel_cache_reader has been observed to result in significant hits to symbolication in some cases.

PiperOrigin-RevId: 382537207
(cherry picked from commit 6fe2926)

* Skip over unsupported test targets in test_suites

PiperOrigin-RevId: 382571317
(cherry picked from commit d3e3536)

* Updates version number to 0.4.384524523.20210713.

Significant changes:
- Unsupported tests in test_suites are now skipped instead of
  throwing an error.
- Disable fallback dSYM searching by default. The fallback can be
  reenabled with the "Enable fallback dSYM searches" option.
  Reenabling is only recommended if Spotlight is disabled as it
  can impact time to symbolicate a binary.
- Fixed a crash with lldb-rpc-server that can occur after
  migrating a rule to use Swift explicit modules.

PiperOrigin-RevId: 384527057
(cherry picked from commit 7440ba0)

* Automatic code cleanup.

PiperOrigin-RevId: 386871254
(cherry picked from commit febfc91)

* Improve failure messages when goldens are outdated

Show the entire diff at once instead of line-by-line

PiperOrigin-RevId: 389889488
(cherry picked from commit d16d184)

* Improve performance of fetching build/bzl files for a project

```
buildfiles(deps($T1)+deps($T2)+deps($T3)+[...])
```

is equivalent to, but generally much slower than

```
buildfiles(deps($T1+$T2+$T3+[...]))
```

PiperOrigin-RevId: 389912462
(cherry picked from commit a5ef86e)

* Swap to build and test with Xcode 12.5.1

Also fix an issue with the OSS tests.

PiperOrigin-RevId: 390164332
(cherry picked from commit d1a4d3c)

#  Conflicts:
# 	.bazelci/presubmit.yml
# 	.bazelrc
# 	WORKSPACE

* Updates version number to 0.4.391542404.20210818.

Significant changes:
- Improved performance when querying for BUILD/bzl files

PiperOrigin-RevId: 391546363
(cherry picked from commit 53d31b0)

* Slight tweaks to build flags used for project generation

- Use the newer `--run_validations` flag
- Disable the `dsyms` output group that some folks might manually enable by accident

PiperOrigin-RevId: 393791135
(cherry picked from commit 043040df1bc175b5f71d7af80877af0fa98e28f1)

* Updates version number to 0.4.396915249.20210915.

PiperOrigin-RevId: 396918740
(cherry picked from commit f151befb3900ae1f122fdf5a4dc2b0870dffd95c)

* Update iOS sim device to use for E2E tests

Updated to be in sync with our current Xcode target of Xcode 12.5.1

PiperOrigin-RevId: 399783838
(cherry picked from commit a3dec4cc165ca4044215f523bac06b1bf7623861)

* Update Tulsi to Xcode 13.0.

PiperOrigin-RevId: 404053261
(cherry picked from commit 4fd4d4caa99220b55fb592488bddc89c73b86d22)

* Automatic code cleanup.

PiperOrigin-RevId: 406138012
(cherry picked from commit 152959785010edc7cc99afde2bbb5e6a54f0a5bf)

* Fix some warnings in the Tulsi module

Also remove some sneaky semicolons.

PiperOrigin-RevId: 406397098
(cherry picked from commit fe0cc3c1f39cf9d66346dbba45f795900e1b9a73)

* Fix some warnings in TulsiGenerator + a xib

Just have some hashable warnings left now plus
2 xibs with clipping warnings.

PiperOrigin-RevId: 407392908
(cherry picked from commit ec25d2f8b4076d7bfeb17ae1b5a925e3dc512aa1)

* Updates version number to 0.4.408971104.20211110.

PiperOrigin-RevId: 408976515
(cherry picked from commit 619e87e1db4c72a59a37803978bd9eba06cea2db)

* Add GitHub Actions

* Use rules_apple and rules_swift at HEADs

* Update golden

* Revert "Revert "Point External Paths into Stable External Directory instead of Unstable Execroot (#255)""

This reverts commit c681436feee92d038b6cf87343771ffae667afc2.

* Point to master branch for the reusing workflow

* Fix tulsi tests after unknown commit.

PiperOrigin-RevId: 411826911
(cherry picked from commit 45060a05093fd8614680d298456b78ae2d381986)

* Fix signing of test runners with Xcode 13

Xcode 13 adds new frameworks which are injected into the test runner.
These must be resigned as well otherwise the app will fail to install
due to a certificate expired/revoked error.

PiperOrigin-RevId: 417654389
(cherry picked from commit 7ff52cd4f8482bac6db148be1c5dea3408a7dd80)

* Add UseLegacyBuildSystem option to swap between new/old build systems

The new build system isn't officially supported yet, so I've added
this flag in preparation for support although it's `true` (legacy)
by default.

This should supplement #277 although I haven't thoroughly tested the new build system support (especially on device + for tests) yet.

PiperOrigin-RevId: 417654737
(cherry picked from commit 2cbc9236818025b471689bd8a1810e6c0655a18a)

* Use `--noexperimental_run_validations` instead of `--norun_validations` to make Tulsi works with projects that are still using Bazel 4 (#297)

Note that building Tulsi itself still requires Bazel 5.0+.

* Update Tulsi python 2.7 scripts to python 3. This will silence the warning that Tulsi needs to be updated when running on macOS Big Sur or newer.

PiperOrigin-RevId: 419846379
(cherry picked from commit 81a5f30fdcb035b3b4e7b53fe27c8d668c5c9f36)

* Increase timeout of //src/TulsiGeneratorIntegrationTests:EndToEndGenerationTests

GitHub Actions provides not so high spec macOS instances, which makes
this test easy to reach the previous timeout setting (900s).

* Updates version number to 0.4.419907671.20220105.

Significant changes:
- Fixed issue running UI tests on device with Xcode 13.

PiperOrigin-RevId: 419910944
(cherry picked from commit 8f850c2aca9d369ec50bbdde9efd82a66abde30c)

* minor README updates (#298)

clarify that the current installation requires cloning the entire project

* Add minimum bazel version check (#302)

This validates folks who are building tulsi don't hit surprising errors.
We should bump this over time

* Update rules_apple (#281)

* Switch back to building with latest Bazel (#306)

* Move the attributes for which Tulsi will search for dependencies into a separate file and add a function that computes the subset of those attributes for a given rule kind.

PiperOrigin-RevId: 420149963
(cherry picked from commit acb9f1c0cef59064a40825161e9621edd825918e)

* Add the ability to specify extra build flags via the CLI during project generation

We'll use + test this ourselves during the E2E generation tests.

PiperOrigin-RevId: 424868778
(cherry picked from commit c305374b0a9be7fcdf3f0f146ef8dc1b12546cc0)

* Fetch E2E build flags from the BazelIntegrationTestCase

This avoids the needs to use a separate file for the build flags.

Note the number of indexer targets changed since CppLib and ObjCLib
are no longer built for iOS 10.

PiperOrigin-RevId: 425623765
(cherry picked from commit 9652ca7468416573b7b7f2a398e09963f24b0e8a)

* Update to build with Xcode 13.2.1

Need to bump rules_apple + Bazel requirement since we require a flag new in Bazel 5
for our tests.

PiperOrigin-RevId: 425968191
(cherry picked from commit 81d85ec1ca222bef40601193909e19812020a30c)

* Update GitHub Actions' `xcode_version` config to 13.2.1

* Fix minor warning in TulsiGenerator

Only warnings left now are hashValue, which are a bit more complicated
to fix due to our usage in PBXObjectProtocol.

PiperOrigin-RevId: 426146113
(cherry picked from commit 0ea4f83afa7f378294c642e9c7994d5ce33335e0)

* Updates version number to 0.4.427587075.20220209.

Significant changes:
- Extra build flags can now be specified during project
  generation via `--build-options`, e.g. `--build-options
  "--keep_going --verbose_failures"`
- Fix a warning about root-level library targets that was being
  printed under incorrect conditions.

PiperOrigin-RevId: 427737504
(cherry picked from commit d4d0e2cd7a8f3ecff3a8efda0fb43c4f470564d5)

* Do not override user-defined output groups

Since Tulsi appends this flag to the build command,
`--output_groups=tulsi_outputs,default` would override any previously
defined `--output_groups` flag.

From the
[documentation](https://bazel.build/reference/command-line-reference#flag--output_groups):
`--output_groups=+foo,+bar` builds the union of the `default` set,
`foo`, and `bar`, while `--output_groups=foo,bar` overrides the default
set such that only `foo` and `bar` are built.

* Add swiftsourceinfo/swiftdoc to list of copied includes (#317)

* Use an unreleased revision of rules_apple for now (#319)

To work around the drop of `should_lipo` in
`apple_common.link_multi_arch_binary`.

* Add support for stub binaries

Currently this will only be used if the `UseLegacyBuildSystem` option
is false.

PiperOrigin-RevId: 428076981
(cherry picked from commit 0fb177476c76043167546a9a7b3aae692738e1b0)

* Always build Tulsi with WMO for now

Workaround to make it builds with Xcode 13.3.

* Change size of AspectTests

The current timeout is not long enough to run on GitHub Actions.

* Update dependencies

* Add CODEOWNERS

This is helpful so folks can know who the POC can be for their issues
and PRs

* Fix CODEOWNERS format

* Update rules_apple

* Added "ios_dynamic_framework" in filteredFileTypes

* wip[

* fix typo

* Update rules_apple

* Remove RULES_SWIFT_BUILD_DUMMY_WORKER

Now that the swift worker uses json instead of protobuf this is no
longer a concern

* Use rolling release for `macos_latest_head_deps`

There's a change in Bazel rolling that is required for this:

https://github.com/bazelbuild/bazel/blob/4858cbfa37d5ed96fb282280819a3577064eb51d/src/main/java/com/google/devtools/build/lib/rules/config/ConfigGlobalLibrary.java#L123-L126

Otherwise the build would fail with:

```
Error in transition: Invalid transition input
'//command_line_option:incompatible_enable_apple_toolchain_resolution'.
Cannot transition on --experimental_* or --incompatible_* options
```

* Add support for resigning UI tests with the new build system

Since the new build system will always inject the test artifacts
after our run script phase for UI tests, we instead add a new
PBXAggregateTarget which allows us to run another script after
the initial UI test target (including the runner) is built.

In addition, we no longer attach xcdatamodels to indexer targets
since it can trigger issues in the new build system. Xcode
has issues inferring their paths and can accidentally scan
the workspace root instead of the xcdatamodeld dir.

PiperOrigin-RevId: 428078393
(cherry picked from commit 65607ed821c4d540cc9f75563e2f06392bebc8e3)

* Added announcement banner class for announcing things to Tulsi users

This is currently unused.

PiperOrigin-RevId: 429136722
(cherry picked from commit c8927202d75c2811de97b7eaa7238bdf3d0c7d3a)

* Added announcement message to CLI output

This is currently not used.

PiperOrigin-RevId: 430227601
(cherry picked from commit f1104d368fb47fcdfbeb2e0d89c4b960920219a1)

* Updates version number to 0.4.433764481.20220310.

Significant changes:
- Added a mechanism to create announcement messages in Tulsi CLI
  output
- Added a dismissible announcement mechanism.

PiperOrigin-RevId: 433782888
(cherry picked from commit 023e5751f849ea5d3a7d69117e35106b90b84734)

* Change default Tulsi location to $HOME/Applications in generate_xcodeproj.sh

build_and_run.sh now install to $HOME/Applications by default. Change
the default Tulsi location in generate_xcodeproj.sh to sync with this.

* Collect framework paths from xcframework imports (#351)

This ensures framework search paths are collected properly for indexing
targets.

* Add `testonly = True` to `swift_library` targets in tests (#355)

This is required after the following change:
bazelbuild/rules_swift@d39d966

* Add document for integrating Tulsi into project (#354)

* Fix CI (#375)

- Use Bazel rolling as the default, latest rules_apple requires this.
- Disable `--incompatible_unambiguous_label_stringification` in tests
- Add missing `testonly = True` attribute
- Disable testing on BazelCI, this is already covered by GitHub Actions
  anyways.

* Modified the announcement banner to:

1. Not overlap the other controls on the splash screen
2. Accept clicks on the entire banner, not just the label
3. Have more muted colors that work both in light and dark mode

Also bumped the target macOS version to 11.0

PiperOrigin-RevId: 438868252
(cherry picked from commit 2ae8dd5968567c5ef69f3a90022e6ba1145bc64a)

* Made --mark-read work as an argument to other modes

PiperOrigin-RevId: 445422722
(cherry picked from commit 4b8a5444a426bd687edfc10f121837065489ae3f)

* Updates version number to 0.4.447517280.20220509.

Significant changes:
- --mark-read can now be used as an argument to any command.
- Improved the notifications banner and bumped min macOS version
  to 11.0.

PiperOrigin-RevId: 447526365
(cherry picked from commit 603b61479ca7e561526977f75a47aa0967646e55)

* Update rules_apple to 1.1.2 (#359)

* Migrate away from "deps" to "storyboards" and "resources".

"deps" implies code dependencies, which the existing watchos_application rule does not support. However, single target watchOS applications which will be supported by a watchos_single_target_application rule and eventually the watchos_application rule itself do own code dependencies. That changes the meaning of "deps" as it is used today.

The "deps" attr will be removed from the watchos_application in a future change on rules_apple, which will be tracked in [].

PiperOrigin-RevId: 474890643
(cherry picked from commit 6b532f6e877bdae7ec30f0c68940eb5f4f3590a6)

* Add dummy framework binary to ObjCFramework test target

Apple framework import rules processing will now enforce framework
bundles include a binary file with the same name as the framework bundle.
This change adds a dummy framework binary file to the `ObjCFramework`
test target to conform to this (future) enforcement.

PiperOrigin-RevId: 452401907
(cherry picked from commit c454b1dc22d4c8f99326026491342a991abb8a91)

* Automatic code cleanup.

PiperOrigin-RevId: 470000427
(cherry picked from commit 152c55885b3913fa4a7e0f440e8da9f8b34e5397)

* Internal change.

PiperOrigin-RevId: 448328593
(cherry picked from commit ff519ded6a897ec2375bbdd5e4ca845e474d0680)

* Upload `load` statements in Tulsi to use the build-definition-specific files instead of the umbrella `swift.bzl`.

PiperOrigin-RevId: 449304144
(cherry picked from commit 3ffd508789877221a145c6028aa1f146b57cac9f)

* Update the Info.plist mtime of any embedded bundles after copying the Bazel build artifacts over to DerivedData. This matches Xcode behavior and more importantly prevents an issue on iOS 16 or newer devices where incrmeental installations fail due to delta bundles not having a bundle ID because they don't have an Info.plist.

PiperOrigin-RevId: 476908178
(cherry picked from commit fc3edc67433192d4742d80de49a6ffbb58e76d63)

* Various fixes for the new build system (+ Xcode 14)

- Add resigner targets to test_suite targets' schemes so the test
  suites schemes work properly
- Mark our build script as always needing to run (always out of date)
  since we always need to run bazel to make sure it's up to date.
- Don't disable signing for iOS simulator since we still need Xcode
  to codesign the test runner + injected dylibs.
- Resign the new XCTestSupport.framework

PiperOrigin-RevId: 457805542
(cherry picked from commit b28485834eafe807c3a3bac0484801b20e98c7ac)

* Use Xcode 13.4.1 on GitHub Actions (#377)

The workflows reference the master branch so has to be done before
bazelbuild/tulsi#369.

* Migrate ObjcConfiguration usage to equivalent info in CppConfiguration

We would like to migrate all such usage to CppConfiguration so that we
can delete the info in ObjcConfiguration.

PiperOrigin-RevId: 457484452
(cherry picked from commit c57119b4bc6c1ce34cc4f331fb359c973276f940)

* Fix a typo from bazelbuild/tulsi@c57119b

PiperOrigin-RevId: 457510067
(cherry picked from commit f423a52ad4199c0826348f553a1cab61ab587797)

* Add arm64 to list of compatible watchOS architectures since Apple Silicon machines will create arm64 watch simulators. This change also dynamically determines the target architecture when building for watch simulators because Xcode sets both x86_64 and arm64 when building for watch simulator so we need to dynamically determine the architecture we need based on the architecture of the host machine.

PiperOrigin-RevId: 468340824
(cherry picked from commit 6e039178388e436f8d61e0bcff7adc750d41db4e)

 Conflicts:
	src/TulsiGenerator/DeploymentTarget.swift
	src/TulsiGenerator/Scripts/bazel_build.py

* Automatic code cleanup.

PiperOrigin-RevId: 460756259
(cherry picked from commit 057bfb3dfe53769b60d8e9aec3597f9d8a2dacea)

 Conflicts:
	src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl

* Internal change.

PiperOrigin-RevId: 461256470
(cherry picked from commit a35154e043cf388975d98edcb350cc1bd25411c0)

* fix merge conflict and bump version

* add migration message on changelog

Co-authored-by: Christopher Sauer <cpsauer@users.noreply.github.com>
Co-authored-by: Thi Doãn <t@thi.im>
Co-authored-by: Googler <noreply@google.com>
Co-authored-by: ivanhernandez <ivanhernandez@google.com>
Co-authored-by: davg <davg@google.com>
Co-authored-by: nglevin <nglevin@google.com>
Co-authored-by: Roland <skofgar@users.noreply.github.com>
Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
Co-authored-by: Erik Kerber <ekerber@slack-corp.com>
Co-authored-by: ivoleko <ivoleko@gmail.com>
Co-authored-by: Kai Zhang <kylerzhang11@gmail.com>
Co-authored-by: rein <rein@google.com>
@thii thii force-pushed the thi/update-to-build-with-xcode-13.4.1 branch from a86407c to f9ba9ca Compare October 13, 2022 13:08
PiperOrigin-RevId: 468022196
(cherry picked from commit d8c299b)
@thii thii force-pushed the thi/update-to-build-with-xcode-13.4.1 branch from f9ba9ca to 137367b Compare October 14, 2022 00:44
@thii thii merged commit b1d0108 into master Oct 14, 2022
@thii thii deleted the thi/update-to-build-with-xcode-13.4.1 branch October 14, 2022 01:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.