Merge branch 'master' of github.com:MessageKit/MessageKit

politan8 · Oct 14, 2020 · aae9a42 · aae9a42
2 parents bf8ba98 + 86cd13e
commit aae9a42
Show file tree

Hide file tree

Showing 41 changed files with 381 additions and 1,897 deletions.
diff --git a/.github/workflows/ci_pr_framework.yml b/.github/workflows/ci_pr_framework.yml
@@ -6,17 +6,10 @@ jobs:
   tests:
     name: Build Framework
     runs-on: macOS-latest
+    env: 
+       DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v2
-    - name: Cache Carthage
-      uses: actions/cache@v1
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-framework-${{ env.cache-name }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-framework-${{ env.cache-name }}-carthage-
-          ${{ runner.os }}-framework-${{ env.cache-name }}-
-          ${{ runner.os }}-framework-
     - name: Build framework
       run: ./GitHubActions/build.sh framework
diff --git a/.github/workflows/ci_pr_tests.yml b/.github/workflows/ci_pr_tests.yml
@@ -6,18 +6,11 @@ jobs:
   tests:
     name: Run Tests
     runs-on: macOS-latest
+    env: 
+       DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v2
-    - name: Cache Carthage
-      uses: actions/cache@v1
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-tests-${{ env.cache-name }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-tests-${{ env.cache-name }}-carthage-
-          ${{ runner.os }}-tests-${{ env.cache-name }}-
-          ${{ runner.os }}-tests-
     - name: Build and run tests
       run: ./GitHubActions/build.sh tests
     - name: Upload coverage to Codecov

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 ## Build generated
 build/
 DerivedData
+.build/
 
 ## Various settings
 *.pbxuser
@@ -37,4 +38,4 @@ Carthage
 
 # SPM
 .swiftpm
-Package.resolved
+Package.resolved
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
 
 ### Changed
 
+- Changed `resources` to `resource_bundle` in MessageKit.podspec [#1460](https://github.com/MessageKit/MessageKit/pull/1460) by [@martinpucik](https://github.com/martinpucik)
+
 ### Removed
 
 ## 3.4.2

diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Example/ChatExample.xcodeproj/project.pbxproj b/Example/ChatExample.xcodeproj/project.pbxproj
@@ -40,7 +40,7 @@
 		882B5E811CF7D53600B6E160 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882B5E781CF7D53600B6E160 /* AppDelegate.swift */; };
 		882B5E901CF7D56000B6E160 /* ChatExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882B5E8E1CF7D56000B6E160 /* ChatExampleUITests.swift */; };
 		882B5E951CF7D56E00B6E160 /* ChatExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882B5E931CF7D56E00B6E160 /* ChatExampleTests.swift */; };
-		9961327FB4F9B96CFD84A126 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		9961327FB4F9B96CFD84A126 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		D4036D91BB2480E403CDC2F1 /* Pods_ChatExampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AC6E3F5C11E39F57598DBE6 /* Pods_ChatExampleUITests.framework */; };
 		F182DD0E2148F655FC0DFF91 /* Pods_ChatExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25FCE8536D329EC8856E2BA8 /* Pods_ChatExampleTests.framework */; };
 /* End PBXBuildFile section */
@@ -147,7 +147,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9961327FB4F9B96CFD84A126 /* (null) in Frameworks */,
+				9961327FB4F9B96CFD84A126 /* BuildFile in Frameworks */,
 				D4036D91BB2480E403CDC2F1 /* Pods_ChatExampleUITests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -541,6 +541,7 @@
 				"${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework",
 				"${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework",
 				"${BUILT_PRODUCTS_DIR}/PINRemoteImage/PINRemoteImage.framework",
+				"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -549,6 +550,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINRemoteImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/Example/Sources/Data Generation/SampleData.swift b/Example/Sources/Data Generation/SampleData.swift
@@ -22,6 +22,7 @@
  SOFTWARE.
  */
 
+import UIKit
 import MessageKit
 import CoreLocation
 import AVFoundation

diff --git a/Example/Sources/Models/MockMessage.swift b/Example/Sources/Models/MockMessage.swift
@@ -23,6 +23,7 @@
  */
 
 import Foundation
+import UIKit
 import CoreLocation
 import MessageKit
 import AVFoundation

diff --git a/Tests/Resources/sound1.m4a → Example/Sources/Resources/sound1.m4a b/Tests/Resources/sound1.m4a → Example/Sources/Resources/sound1.m4a
diff --git a/Example/Sources/View Controllers/MessageSubviewViewController.swift b/Example/Sources/View Controllers/MessageSubviewViewController.swift
@@ -23,6 +23,7 @@ SOFTWARE.
 */
 
 import Foundation
+import UIKit
 import InputBarAccessoryView
 
 final class MessageSubviewViewController: BasicExampleViewController {

diff --git a/GitHubActions/build.sh b/GitHubActions/build.sh
@@ -35,15 +35,13 @@ MODE="$1"
 
 if [ "$MODE" = "tests" -o "$MODE" = "all" ]; then
   echo "Running MessageKit tests."
-  carthage bootstrap --platform ios
-  set -o pipefail && xcodebuild test -project MessageKit.xcodeproj -scheme MessageKitTests -destination "platform=iOS Simulator,name=iPhone 11 Pro" CODE_SIGNING_REQUIRED=NO | xcpretty -c
+  set -o pipefail && xcodebuild test -scheme MessageKit -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 11" | xcpretty -c
   success="1"
 fi
 
 if [ "$MODE" = "framework" -o "$MODE" = "all" ]; then
   echo "Building MessageKit Framework."
-  carthage bootstrap --platform ios
-  set -o pipefail && xcodebuild build -project MessageKit.xcodeproj -scheme MessageKit -destination "platform=iOS Simulator,name=iPhone 11 Pro" CODE_SIGNING_REQUIRED=NO | xcpretty -c
+  set -o pipefail && xcodebuild build -scheme MessageKit -destination "platform=iOS Simulator,name=iPhone 11" | xcpretty -c
   success="1"
 fi
 
@@ -53,7 +51,7 @@ if [ "$MODE" = "example" -o "$MODE" = "all" ]; then
   gem install bundler
   bundle check || bundle install
   bundle exec pod install
-  set -o pipefail && xcodebuild build analyze -workspace ChatExample.xcworkspace -scheme ChatExample -destination "platform=iOS Simulator,name=iPhone 11 Pro" CODE_SIGNING_REQUIRED=NO | xcpretty -c
+  set -o pipefail && xcodebuild build analyze -workspace ChatExample.xcworkspace -scheme ChatExample -destination "platform=iOS Simulator,name=iPhone 11" CODE_SIGNING_REQUIRED=NO | xcpretty -c
   success="1"
 fi
 

diff --git a/MessageKit.podspec b/MessageKit.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
    s.swift_version = '5.3'
 
    s.ios.deployment_target = '12.0'
-   s.ios.resources = ['Sources/Assets.xcassets']
+   s.ios.resource_bundle = { 'MessageKit' => 'Sources/Assets.xcassets' }
 
    s.dependency 'InputBarAccessoryView', '~> 5.2.1'