Skip to content

Commit d6ffbf8

Browse files
ashleyngashleyng
committed
Merge branch 'development' into Support_iPad_SplitView
2 parents f345d80 + 6733905 commit d6ffbf8

File tree

91 files changed

+182
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+182
-86
lines changed

‎.github/workflows/ci_pr_example.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@ jobs:
1313
uses: actions/cache@v1
1414
with:
1515
path: Example/Pods
16-
key: ${{ runner.os }}-pods-${{ hashFiles('**/Example/Podfile.lock') }}
16+
key: ${{ runner.os }}-example-${{ env.cache-name }}-pods-${{ hashFiles('**/Example/Podfile.lock') }}
1717
restore-keys: |
18-
${{ runner.os }}-pods-
19-
- name: Cache SPM
18+
${{ runner.os }}-example-${{ env.cache-name }}-pods-
19+
${{ runner.os }}-example-${{ env.cache-name }}-
20+
${{ runner.os }}-example-
21+
- name: Cache Gems
2022
uses: actions/cache@v1
2123
with:
22-
path: .build
23-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Example/Gemfile.lock') }}
24+
path: vendor/bundle
25+
key: ${{ runner.os }}-example-${{ env.cache-name }}-gems-${{ hashFiles('**/Example/Gemfile.lock') }}
2426
restore-keys: |
25-
${{ runner.os }}-gems-
27+
${{ runner.os }}-example-${{ env.cache-name }}-gems-
28+
${{ runner.os }}-example-${{ env.cache-name }}-
29+
${{ runner.os }}-example-
2630
- name: Build and run example project
2731
run: ./GitHubActions/build.sh example

‎.github/workflows/ci_pr_framework.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
uses: actions/cache@v1
1414
with:
1515
path: Carthage
16-
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
16+
key: ${{ runner.os }}-framework-${{ env.cache-name }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
1717
restore-keys: |
18-
${{ runner.os }}-carthage-
18+
${{ runner.os }}-framework-${{ env.cache-name }}-carthage-
19+
${{ runner.os }}-framework-${{ env.cache-name }}-
20+
${{ runner.os }}-framework-
1921
- name: Build framework
2022
run: ./GitHubActions/build.sh framework

‎.github/workflows/ci_pr_tests.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
uses: actions/cache@v1
1414
with:
1515
path: Carthage
16-
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
16+
key: ${{ runner.os }}-tests-${{ env.cache-name }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
1717
restore-keys: |
18-
${{ runner.os }}-carthage-
18+
${{ runner.os }}-tests-${{ env.cache-name }}-carthage-
19+
${{ runner.os }}-tests-${{ env.cache-name }}-
20+
${{ runner.os }}-tests-
1921
- name: Build and run tests
2022
run: ./GitHubActions/build.sh tests

‎.github/workflows/danger.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ jobs:
1313
uses: actions/cache@v1
1414
with:
1515
path: vendor/bundle
16-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
16+
key: ${{ runner.os }}-danger-${{ env.cache-name }}-gems-${{ hashFiles('**/Gemfile.lock') }}
1717
restore-keys: |
18-
${{ runner.os }}-gems-
18+
${{ runner.os }}-danger-${{ env.cache-name }}-gems-
19+
${{ runner.os }}-danger-${{ env.cache-name }}-
20+
${{ runner.os }}-danger-
1921
- name: Run build script
2022
run: gem install bundler && bundle install && bundle exec danger --fail-on-errors=true
2123
env:

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions

‎Example/ChatExample.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,16 @@
146146
/* End PBXFrameworksBuildPhase section */
147147

148148
/* Begin PBXGroup section */
149+
13FCBEED2424D36900CB489F /* Resources */ = {
150+
isa = PBXGroup;
151+
children = (
152+
882B5E7F1CF7D53600B6E160 /* Info.plist */,
153+
882B5E791CF7D53600B6E160 /* Assets.xcassets */,
154+
882B5E7A1CF7D53600B6E160 /* LaunchScreen.storyboard */,
155+
);
156+
path = Resources;
157+
sourceTree = "<group>";
158+
};
149159
385C2924211FF3310010B4BA /* Views */ = {
150160
isa = PBXGroup;
151161
children = (
@@ -176,6 +186,7 @@
176186
385C2933211FF3670010B4BA /* Extensions */ = {
177187
isa = PBXGroup;
178188
children = (
189+
385C292A211FF3450010B4BA /* Settings+UserDefaults.swift */,
179190
385C292F211FF3630010B4BA /* UIColor+Extensions.swift */,
180191
385C2930211FF3630010B4BA /* UIViewController+Extensions.swift */,
181192
);
@@ -265,17 +276,14 @@
265276
children = (
266277
882B5E781CF7D53600B6E160 /* AppDelegate.swift */,
267278
50739F9421C5075D008CA369 /* AudioController */,
268-
385C2949211FF3930010B4BA /* View Controllers */,
269279
385C293A211FF3800010B4BA /* Data Generation */,
280+
385C2933211FF3670010B4BA /* Extensions */,
270281
385C292E211FF3540010B4BA /* Layout */,
271282
385C2929211FF33D0010B4BA /* Models */,
272-
385C2924211FF3310010B4BA /* Views */,
283+
13FCBEED2424D36900CB489F /* Resources */,
273284
5074EF4B2163554900D82952 /* Sounds */,
274-
882B5E791CF7D53600B6E160 /* Assets.xcassets */,
275-
882B5E7F1CF7D53600B6E160 /* Info.plist */,
276-
882B5E7A1CF7D53600B6E160 /* LaunchScreen.storyboard */,
277-
385C292A211FF3450010B4BA /* Settings+UserDefaults.swift */,
278-
385C2933211FF3670010B4BA /* Extensions */,
285+
385C2949211FF3930010B4BA /* View Controllers */,
286+
385C2924211FF3310010B4BA /* Views */,
279287
);
280288
path = Sources;
281289
sourceTree = "<group>";
@@ -489,11 +497,17 @@
489497
"${PODS_ROOT}/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh",
490498
"${BUILT_PRODUCTS_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework",
491499
"${BUILT_PRODUCTS_DIR}/MessageKit/MessageKit.framework",
500+
"${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework",
501+
"${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework",
502+
"${BUILT_PRODUCTS_DIR}/PINRemoteImage/PINRemoteImage.framework",
492503
);
493504
name = "[CP] Embed Pods Frameworks";
494505
outputPaths = (
495506
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/InputBarAccessoryView.framework",
496507
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessageKit.framework",
508+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINCache.framework",
509+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework",
510+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINRemoteImage.framework",
497511
);
498512
runOnlyForDeploymentPostprocessing = 0;
499513
shellPath = /bin/sh;
@@ -722,7 +736,7 @@
722736
buildSettings = {
723737
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
724738
DEVELOPMENT_TEAM = "";
725-
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
739+
INFOPLIST_FILE = "$(SRCROOT)/Sources/Resources/Info.plist";
726740
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
727741
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.ChatExample;
728742
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -736,7 +750,7 @@
736750
buildSettings = {
737751
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
738752
DEVELOPMENT_TEAM = "";
739-
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
753+
INFOPLIST_FILE = "$(SRCROOT)/Sources/Resources/Info.plist";
740754
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
741755
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.ChatExample;
742756
PRODUCT_NAME = "$(TARGET_NAME)";

‎Example/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323

2424
source 'https://rubygems.org'
25-
gem 'cocoapods', '~> 1.9'
25+
gem 'cocoapods', '~> 1.9.1'

‎Example/Gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ GEM
1212
json (>= 1.5.1)
1313
atomos (0.1.3)
1414
claide (1.0.3)
15-
cocoapods (1.9.0)
15+
cocoapods (1.9.1)
1616
activesupport (>= 4.0.2, < 5)
1717
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.9.0)
18+
cocoapods-core (= 1.9.1)
1919
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2020
cocoapods-downloader (>= 1.2.2, < 2.0)
2121
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
3131
nap (~> 1.0)
3232
ruby-macho (~> 1.4)
3333
xcodeproj (>= 1.14.0, < 2.0)
34-
cocoapods-core (1.9.0)
34+
cocoapods-core (1.9.1)
3535
activesupport (>= 4.0.2, < 6)
3636
algoliasearch (~> 1.0)
3737
concurrent-ruby (~> 1.1)
@@ -84,7 +84,7 @@ PLATFORMS
8484
ruby
8585

8686
DEPENDENCIES
87-
cocoapods (~> 1.9)
87+
cocoapods (~> 1.9.1)
8888

8989
BUNDLED WITH
9090
2.1.4

‎Example/Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ target 'ChatExample' do
66
use_frameworks!
77
pod 'MessageKit', :path => '../'
88
pod 'SwiftLint', '~> 0.39.1'
9+
pod 'PINRemoteImage', '~> 3.0.0', :subspecs => ['iOS', 'PINCache']
910

1011
target 'ChatExampleTests' do
1112
inherit! :search_paths

‎Example/Podfile.lock‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,35 @@ PODS:
44
- InputBarAccessoryView/Core (4.3.2)
55
- MessageKit (3.1.0):
66
- InputBarAccessoryView (~> 4.3.0)
7+
- PINCache (3.0.1-beta.8):
8+
- PINCache/Arc-exception-safe (= 3.0.1-beta.8)
9+
- PINCache/Core (= 3.0.1-beta.8)
10+
- PINCache/Arc-exception-safe (3.0.1-beta.8):
11+
- PINCache/Core
12+
- PINCache/Core (3.0.1-beta.8):
13+
- PINOperation (~> 1.1.1)
14+
- PINOperation (1.1.2)
15+
- PINRemoteImage/Core (3.0.0):
16+
- PINOperation
17+
- PINRemoteImage/iOS (3.0.0):
18+
- PINRemoteImage/Core
19+
- PINRemoteImage/PINCache (3.0.0):
20+
- PINCache (= 3.0.1-beta.8)
21+
- PINRemoteImage/Core
722
- SwiftLint (0.39.1)
823

924
DEPENDENCIES:
1025
- MessageKit (from `../`)
26+
- PINRemoteImage/iOS (~> 3.0.0)
27+
- PINRemoteImage/PINCache (~> 3.0.0)
1128
- SwiftLint (~> 0.39.1)
1229

1330
SPEC REPOS:
1431
trunk:
1532
- InputBarAccessoryView
33+
- PINCache
34+
- PINOperation
35+
- PINRemoteImage
1636
- SwiftLint
1737

1838
EXTERNAL SOURCES:
@@ -22,8 +42,11 @@ EXTERNAL SOURCES:
2242
SPEC CHECKSUMS:
2343
InputBarAccessoryView: 7985d418040a05fe894bd4b8328dd43ab35517c3
2444
MessageKit: 3c593dc22f7465f74822e4a873ef3157a3e05080
45+
PINCache: 534fd41d358d828dfdf227a0d327f3673a65e20b
46+
PINOperation: 24b774353ca248fcf87d67b2d61eef42087c125a
47+
PINRemoteImage: e2b89e19fb6e77ffc099f9d9f3b3fe1745e3f9f9
2548
SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046
2649

27-
PODFILE CHECKSUM: 3d2d8513a2319438f3480a9f1397e1f78b0a5021
50+
PODFILE CHECKSUM: cf0af8a506e2b58d4d51b99e165b58c56c26d619
2851

2952
COCOAPODS: 1.9.1

0 commit comments

Comments
 (0)