Merge upstream 3.2.0 #22

manicmaniac · 2023-08-24T03:59:16Z

Overview

Merged upstream/3.2.0 into master at 3fde158
Resolved a number of conflicts at d79d939 and ab772c4
Fixed unit test at c08c3dc
Resolved CI problems at 86bccf0 and the later commits

You don't need to see other commits.

Known issues

Example app cannnot be built as reported in MessageKit#1441

To workaround this, cherry-pick the PR.

git cherry-pick 94fd0709c1b901dd0e6586670d879c1517d2442f

Screenshot

Update Circle CI PR tests to include cache for pods

Add PR tests by Danger and SwiftLint

github-actions · 2023-08-24T08:01:02Z

	4 Warnings
⚠️	Big Pull Request - Please consider splitting up your changes into smaller Pull Requests.
⚠️	Sources/Layout/MessageSizeCalculator.swift#L111 - Function body should span 40 lines or less excluding comments and whitespace: currently spans 43 lines `function_body_length` `MessageSizeCalculator.swift:111`
⚠️	Sources/Layout/MessagesCollectionViewFlowLayout.swift#L181 - Function should have complexity 10 or less: currently complexity equals 12 `cyclomatic_complexity` `MessagesCollectionViewFlowLayout.swift:181`
⚠️	Sources/Views/Cells/MessageContentCell.swift#L348 - Limit vertical whitespace to a single empty line. Currently 2. `vertical_whitespace` `MessageContentCell.swift:348`

Generated by 🚫 Danger

manicmaniac · 2023-08-24T11:34:51Z

Example/Sources/View Controllers/LaunchViewController.swift

-=======
-    let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Subview Example", "SwiftUI Example", "Settings", "Source Code", "Contributors"]
->>>>>>> theirs
+    let cells = ["Announcement Example", "Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Subview Example", "SwiftUI Example", "Settings", "Source Code", "Contributors"]


Announcement feature was added by @m-sugawara.

manicmaniac · 2023-08-24T11:36:15Z

Sources/Models/MessageStyle.swift

    case leftBubble
    case rightBubble
    case announcement
    case warning(color: UIColor)


We heavily customize MessageStyle. Upstream changes are simply ignored.

manicmaniac · 2023-08-24T11:37:25Z

Tests/ViewsTests/AvatarViewTests.swift

@@ -50,7 +50,7 @@ class AvatarViewTests: XCTestCase {
    func testWithImage() {
        let avatar = Avatar(image: nil)
        avatarView.set(avatar: avatar)
-        XCTAssertEqual(avatar.initials, "?")
+        XCTAssertEqual(avatar.initials, "")


We changed the default value at de95cd4#diff-8272c0fbb141fe6938bead67a2365ce451c7ecb42e0107acc6443ce23e7d2581

manicmaniac · 2023-08-24T11:44:00Z

GitHubActions/build.sh

@@ -35,14 +35,14 @@ MODE="$1"

 if [ "$MODE" = "tests" -o "$MODE" = "all" ]; then
  echo "Running MessageKit tests."
-  carthage bootstrap --platform ios
+  carthage checkout && ./GitHubActions/install-dependencies.sh


Back then, Carthage did not support xcframework.
Nowadays we need to use xcframework to build on both Intel Mac and Apple Silicon like carthage bootstrap --platform ios --use-xcframeworks.

However, to use xcframeworks need to vastly change project settings, which leads conflicts in future update.

So I added ./GitHubActions/install-dependencies.sh script to build frameworks using xcodebuild directly.

manicmaniac · 2023-08-24T11:45:32Z

GitHubActions/install-dependencies.sh

+    xcodebuild build \
+        -project "$project" \
+        -scheme "$scheme" \
+        -configuration Debug \
+        -derivedDataPath "$derived_data_dir" \
+        -sdk iphonesimulator \
+        -quiet \
+        ONLY_ACTIVE_ARCH=YES \
+        CODE_SIGNING_REQUIRED=NO \
+        CODE_SIGN_IDENTITY= \
+        CARTHAGE=YES


This is almost same as Carthage does but this script builds framework for active architecture only.

manicmaniac · 2023-08-24T11:47:27Z

.github/workflows/ci_pr_example.yml

@@ -5,7 +5,7 @@ on: pull_request
 jobs:
  tests:
    name: Build Example app
-    runs-on: macOS-latest
+    runs-on: macOS-11


The current macOS-latest is equivalent to macOS-12.
At that time, macOS-11 should be the latest.

upstream/3.2.0 dependes on Ruby 2.7 which is not installed in macOS-12 but macOS-11.

manicmaniac · 2023-08-25T06:04:59Z

Example/Podfile

+# Workaround for https://github.com/pinterest/PINRemoteImage/issues/566
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    next unless %w[PINCache PINRemoteImage].include?(target.name)
+
+    target.build_configurations.each do |config|
+      config.build_settings['OTHER_CFLAGS'] = [
+        '$(inherited)',
+        '-Xclang',
+        '-fcompatibility-qualified-id-block-type-checking'
+      ].join(' ')
+    end
+  end
+end


One of the dependencies PINRemoteImage (and its subspec PINCache) is not compatible with Xcode 12.
The compiler complains that there's incompatible block pointers.

So I added workaround to disable this warning by passing extra flags.

pinterest/PINRemoteImage#566

k-kohey

LGTM

elliekwon

Overviewに書かれてるcommitで疑問はありません！LGTM🚀

Kaspik added 30 commits February 26, 2020 13:00

Update changelog for development again

454b3f6

Change example build to use cache for pods, without fetching specs

fc9b0ce

Update pods cache

426dbde

Update config and podspec

60e09a6

Fix string char

8567db0

Pre-start simulator for running tests

5fb3079

Fix config

248e364

Add Github Actions config for Danger and Swiftlint running on PRs

97357c7

Fix syntax for run

b6ca5cf

Fix PR

12c23a8

Update config

5ba964b

Merge branch 'circleCIUpdates' into PR_danger_swiftlint

387e3d7

Fix PR header

6f5e96e

Merge pull request MessageKit#1256 from classdojo/circleCIUpdates

4b4dd27

Update Circle CI PR tests to include cache for pods

Fix Dangerfile

53cfda9

Merge pull request MessageKit#1257 from classdojo/PR_danger_swiftlint

5a33741

Add PR tests by Danger and SwiftLint

Remove deprecated file for swift version

eff62f8

Merge branch 'fixAppVersion' into cleanupSwift

16b4505

Merge branch 'master' into development

b17f471

Merge branch 'development' into cleanupSwift

ee7ebc5

Update Copyright date

7c66e23

Drop iOS 9 and iOS 10

bc7ba72

Update example project

26c38d5

Update changelog

c57db5f

Remove travis.ci file as this project uses Circle CI

e20dcc4

Fix tests

9a492e9

Update codecov code

46616a0

Fix badge for correct branch

b0ab6f9

Merge branch 'master' into development

7729b8c

Merge branch 'development' into cleanupSwift

369a6c1

Fix test failure

c08c3dc

manicmaniac self-assigned this Aug 24, 2023

manicmaniac force-pushed the merge-upstream-3.2.0 branch 5 times, most recently from 98c3dc1 to 23d215a Compare August 24, 2023 07:59

manicmaniac force-pushed the merge-upstream-3.2.0 branch from 022299a to 788f216 Compare August 24, 2023 11:14

manicmaniac commented Aug 24, 2023

View reviewed changes

manicmaniac marked this pull request as ready for review August 24, 2023 11:50

manicmaniac requested review from m-sugawara, k-kohey and elliekwon August 24, 2023 11:50

manicmaniac force-pushed the merge-upstream-3.2.0 branch 2 times, most recently from 12f4721 to d3ba066 Compare August 25, 2023 05:47

manicmaniac commented Aug 25, 2023

View reviewed changes

manicmaniac added 3 commits August 25, 2023 15:06

Add workaround to build MessageKit

c5bbddb

Back then macOS 11 was the latest

1f2d2eb

Add workaround for compilation error of PINRemoteImage

7ecbe46

pinterest/PINRemoteImage#566

manicmaniac force-pushed the merge-upstream-3.2.0 branch from d3ba066 to 7ecbe46 Compare August 25, 2023 06:06

k-kohey approved these changes Aug 25, 2023

View reviewed changes

elliekwon approved these changes Aug 25, 2023

View reviewed changes

manicmaniac merged commit 9772e58 into master Aug 25, 2023
4 checks passed

manicmaniac changed the title ~~Merge upstream/3.2.0~~ Merge upstream 3.2.0 Aug 25, 2023

manicmaniac referenced this pull request Aug 28, 2023

Comment out image cache clean up procedure

d3de8c3

manicmaniac mentioned this pull request Aug 28, 2023

Merge upstream 3.3.0 #23

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream 3.2.0 #22

Merge upstream 3.2.0 #22

manicmaniac commented Aug 24, 2023 •

edited

Loading

github-actions bot commented Aug 24, 2023 •

edited

Loading

manicmaniac Aug 24, 2023

manicmaniac Aug 24, 2023

manicmaniac Aug 24, 2023

manicmaniac Aug 24, 2023

manicmaniac Aug 24, 2023

manicmaniac Aug 24, 2023 •

edited

Loading

manicmaniac Aug 25, 2023

k-kohey left a comment

elliekwon left a comment

Merge upstream 3.2.0 #22

Merge upstream 3.2.0 #22

Conversation

manicmaniac commented Aug 24, 2023 • edited Loading

Overview

Known issues

Screenshot

github-actions bot commented Aug 24, 2023 • edited Loading

manicmaniac Aug 24, 2023

Choose a reason for hiding this comment

manicmaniac Aug 24, 2023

Choose a reason for hiding this comment

manicmaniac Aug 24, 2023

Choose a reason for hiding this comment

manicmaniac Aug 24, 2023

Choose a reason for hiding this comment

manicmaniac Aug 24, 2023

Choose a reason for hiding this comment

manicmaniac Aug 24, 2023 • edited Loading

Choose a reason for hiding this comment

manicmaniac Aug 25, 2023

Choose a reason for hiding this comment

k-kohey left a comment

Choose a reason for hiding this comment

elliekwon left a comment

Choose a reason for hiding this comment

manicmaniac commented Aug 24, 2023 •

edited

Loading

github-actions bot commented Aug 24, 2023 •

edited

Loading

manicmaniac Aug 24, 2023 •

edited

Loading