Skip to content

chore: sync OHOS branch with 2.2.5#131

Merged
ZGaopeng merged 4 commits into
ohos/mainfrom
ohos/sync-main-2.2.5
Jul 15, 2026
Merged

chore: sync OHOS branch with 2.2.5#131
ZGaopeng merged 4 commits into
ohos/mainfrom
ohos/sync-main-2.2.5

Conversation

@ZGaopeng

@ZGaopeng ZGaopeng commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • sync the prefixed Iris native symbols from main
  • sync the concurrent event-dispatch fix and its regression test
  • advance the OHOS branch release metadata to 2.2.5 while preserving the OHOS platform scaffold and shared-library loading

Validation

  • Flutter 3.35.8-ohos-1.0.1: flutter test (47 tests)
  • Flutter 3.24.5: flutter test (47 tests)
  • flutter build hap --debug --no-codesign
  • flutter build hap --release --no-codesign
  • verified the arm64 libiris_method_channel.so payload and all five Iris_* exports

Notes

  • the 2.2.4 cherry-pick had one expected version-line conflict between 2.2.3-ohos.223 and 2.2.4; it was resolved to follow the main release sequence, ending at 2.2.5
  • do not publish this branch independently as 2.2.5 without a separate version/tag decision; the existing 2.2.5 tag points to main and that version is already part of the main release line

ZGaopeng and others added 4 commits July 14, 2026 16:19
Prepare releasing **2.2.4**

After this pull request is merged, the following steps below will be
going on:

* Create tag for **2.2.4**
* Publish to pub.dev
* Create Github release for **2.2.4**

*This pull request is opened by bot*

Co-authored-by: ZGaopeng <ZGaopeng@users.noreply.github.com>
Prepare releasing **2.2.5**

After this pull request is merged, the following steps below will be
going on:

* Create tag for **2.2.5**
* Publish to pub.dev
* Create Github release for **2.2.5**

*This pull request is opened by bot*

Co-authored-by: ZGaopeng <ZGaopeng@users.noreply.github.com>
@ZGaopeng
ZGaopeng merged commit e66f29d into ohos/main Jul 15, 2026
7 of 26 checks passed
@ZGaopeng
ZGaopeng deleted the ohos/sync-main-2.2.5 branch July 15, 2026 08:23
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.

1 participant