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

Backport "use new zinc 1.8 api for VirtualFile" to LTS #19128

Merged
merged 10 commits into from
Dec 8, 2023

Conversation

Kordyjan
Copy link
Contributor

@Kordyjan Kordyjan commented Dec 1, 2023

Backports #18137 to the LTS branch.

PR submitted by the release tooling.
[skip ci]

Kordyjan and others added 10 commits December 1, 2023 13:24
[Cherry-picked a7cec5f][modified]
zinc 1.4 removes the dependency on protobuf-java, so fails
to compile mtags-shared due to the now missing transitive
dependency.

The compiler implements protobuf streams for semanticdb, so reuse
it in the source generator for mtags-shared.

[Cherry-picked 34a5e45]
[Cherry-picked 246dfc4][modified]
[Cherry-picked e3de91c]
@bishabosha
Copy link
Member

how is the merge order decided, because it looks from a glance that at least this should depend on #19061

@Kordyjan
Copy link
Contributor Author

Kordyjan commented Dec 1, 2023

It is depending on #19061. It has 0147f07 in its upstream.

git merge-base --is-ancestor 0147f072f5b38c73e6de025e537f8e319d815e18  lts-18137

returns 0.

Backports follow merge queue, so each one have all previous in the upstream.

Base automatically changed from lts-18198 to release-3.3.2 December 8, 2023 15:20
@Kordyjan
Copy link
Contributor Author

Kordyjan commented Dec 8, 2023

No regressions detected in the community build up to lts-16941.

Reference

@Kordyjan Kordyjan merged commit 32a6cfc into release-3.3.2 Dec 8, 2023
19 checks passed
@Kordyjan Kordyjan deleted the lts-18137 branch December 8, 2023 15:21
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.

2 participants