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

Merge upstream 3.4.2 #24

Merged
merged 25 commits into from
Aug 29, 2023
Merged

Merge upstream 3.4.2 #24

merged 25 commits into from
Aug 29, 2023

Conversation

manicmaniac
Copy link
Member

@manicmaniac manicmaniac commented Aug 28, 2023

Overview

  • Merged upstream/3.4.2 at a92f80b.
  • Resolved some conflicts at 3a2ac0f
  • Added missing import UIKit at 304483d

3a2ac0f and 304483d need to be reviewed.

Screenshot

image

@manicmaniac manicmaniac self-assigned this Aug 28, 2023
=======
PODFILE CHECKSUM: 24c39a08ead4a8771aa94310cfc35fe3be6b3105
>>>>>>> 3.4.2
PODFILE CHECKSUM: 31c6eb1d734807f78336ea60201a116e2410b2dd
Copy link
Member Author

Choose a reason for hiding this comment

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

This checksum was recalculated by bundle exec pod install

@@ -29,7 +29,7 @@ internal extension MessageKind {
switch self {
case .linkPreview(let linkItem):
return linkItem.textKind
case .text, .emoji, .attributedText:
case .announcement, .text, .emoji, .attributedText:
Copy link
Member Author

Choose a reason for hiding this comment

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

.announcement was added by us.

@@ -7,6 +7,7 @@
//

import Foundation
import UIKit
Copy link
Member Author

@manicmaniac manicmaniac Aug 28, 2023

Choose a reason for hiding this comment

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

From some version of Swift Package Manager, packages are not be compiled without declaring the correct imported modules.

In this file UIFont, UIEdgeInsets and other UI-prefixed classes are used.

@manicmaniac manicmaniac marked this pull request as ready for review August 28, 2023 12:25
Copy link

@elliekwon elliekwon left a comment

Choose a reason for hiding this comment

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

3a2ac0f304483d を確認致しました🙏

Copy link

@m-sugawara m-sugawara left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Copy link

@k-kohey k-kohey left a comment

Choose a reason for hiding this comment

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

LGTM

@manicmaniac manicmaniac merged commit 2af99ca into master Aug 29, 2023
4 checks passed
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.

6 participants