forked from MessageKit/MessageKit
-
Notifications
You must be signed in to change notification settings - Fork 0
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
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 af2f9cd
Fix compilation issues by importing UIKit
085eddc
Merge branch 'master' into development
3272e5d
Merge pull request #1457 from tikhop/development
Kaspik 24ec632
Bump minimum iOS to 12, update fox XCode 12, update example, update p…
Kaspik 4a47214
update changelog
Kaspik 72ac068
Fix readme
Kaspik 3bd7f82
Merge pull request #1464 from MessageKit/xcode12
Kaspik 3e20aee
Merge pull request #1465 from MessageKit/development
Kaspik 7c83db3
Fix IBAV SPM minimum version
Kaspik 22b086c
Remove ConcreteMessageType, handle the case where the messageKind is …
kinoroy 4eb6a9a
Add MIT License header
kinoroy 2fdc4f1
Adds clarifying access modifier
kinoroy ad4fea8
Add changelog entry
kinoroy 85d2744
Fix xcodproj missing/extra files
kinoroy 28a0e81
Merge pull request #1469 from MessageKit/remove-concrete-message
kinoroy 2362616
remove keyboard observers in viewWillDisappear
kinoroy 84e710c
Add changelog entry
kinoroy 40442dc
Merge pull request #1476 from MessageKit/keyboard-observers
Kaspik 1e4b93c
Bump dependencies, ship 3.4.2
Kaspik a92f80b
Merge tag '3.4.0' into merge-upstream-3.4.0
manicmaniac 9ba7458
Merge tag '3.4.1' into merge-upstream-3.4.2
manicmaniac 0e52f88
Force merge tag '3.4.2' into merge-upstream-3.4.2 with remaining conf…
manicmaniac 3a2ac0f
fixup! Resolve conflicts
manicmaniac 304483d
Add missing import
manicmaniac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
return self | ||
default: | ||
fatalError("textMessageKind not supported for messageKind: \(self)") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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