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
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
391f96a
Update changelog for development
Kaspik Sep 4, 2020
af2f9cd
Fix compilation issues by importing UIKit
Sep 8, 2020
085eddc
Merge branch 'master' into development
Sep 8, 2020
3272e5d
Merge pull request #1457 from tikhop/development
Kaspik Sep 11, 2020
24ec632
Bump minimum iOS to 12, update fox XCode 12, update example, update p…
Kaspik Sep 16, 2020
4a47214
update changelog
Kaspik Sep 16, 2020
72ac068
Fix readme
Kaspik Sep 16, 2020
3bd7f82
Merge pull request #1464 from MessageKit/xcode12
Kaspik Sep 16, 2020
3e20aee
Merge pull request #1465 from MessageKit/development
Kaspik Sep 16, 2020
7c83db3
Fix IBAV SPM minimum version
Kaspik Sep 16, 2020
22b086c
Remove ConcreteMessageType, handle the case where the messageKind is …
kinoroy Sep 19, 2020
4eb6a9a
Add MIT License header
kinoroy Sep 20, 2020
2fdc4f1
Adds clarifying access modifier
kinoroy Sep 20, 2020
ad4fea8
Add changelog entry
kinoroy Sep 20, 2020
85d2744
Fix xcodproj missing/extra files
kinoroy Sep 20, 2020
28a0e81
Merge pull request #1469 from MessageKit/remove-concrete-message
kinoroy Sep 20, 2020
2362616
remove keyboard observers in viewWillDisappear
kinoroy Oct 1, 2020
84e710c
Add changelog entry
kinoroy Oct 1, 2020
40442dc
Merge pull request #1476 from MessageKit/keyboard-observers
Kaspik Oct 2, 2020
1e4b93c
Bump dependencies, ship 3.4.2
Kaspik Oct 5, 2020
a92f80b
Merge tag '3.4.0' into merge-upstream-3.4.0
manicmaniac Aug 28, 2023
9ba7458
Merge tag '3.4.1' into merge-upstream-3.4.2
manicmaniac Aug 28, 2023
0e52f88
Force merge tag '3.4.2' into merge-upstream-3.4.2 with remaining conf…
manicmaniac Aug 28, 2023
3a2ac0f
fixup! Resolve conflicts
manicmaniac Aug 28, 2023
304483d
Add missing import
manicmaniac Aug 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Sources/Layout/AnnounceMessageSizeCalculator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.


open class AnnouncementMessageSizeCalculator: MessageSizeCalculator {

Expand Down
Loading