Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CBL-4824: Move fixes for 3.1.2 from next/3.1 to release/3.1 #187

Merged
merged 2 commits into from
Aug 29, 2023

Conversation

callumbirks
Copy link
Contributor

@callumbirks callumbirks commented Aug 16, 2023

Looks like Core release branch requires Fleece submodule points to matching release branch.
This is merged from master up to the point required for CBL-4824, which is the Xcode 14.3 fixes that allow Core to build.

Copy link
Member

@borrrden borrrden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are beryllium tickets in the commits here, I think those will need to be changed.

@velicuvlad
Copy link
Contributor

velicuvlad commented Aug 24, 2023

ea80355 has to be taken out. We moved to 11 and 10.14 for 3.1 as well #182

@callumbirks
Copy link
Contributor Author

Yeah I think I did this the wrong way. Going to redo

@callumbirks
Copy link
Contributor Author

Okay so redid this with a cherry-pick of just CBL-4471 (8e10e3d) which is the only commit in Fleece which needs to brought forward for the 3.1.2 fixes that were sat in the next branch

@@ -13,7 +13,7 @@
//

// Workaround for Catch 2 requiring C++ features not available until macOS 10.12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the comment still valid?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not, no. I can remove it

@callumbirks callumbirks merged commit 4ba420b into release/3.1 Aug 29, 2023
3 checks passed
@callumbirks callumbirks deleted the CBL-4824 branch August 29, 2023 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants