Merge branch 'development' into cleanupSwift

.circleci/config.yml

@@ -1,76 +0,0 @@
-# Specify the config version
-version: 2.1
-
-# Define the jobs for the current project
-jobs:
-  build_tests:
-    macos:
-      xcode: 11.3.1
-    environment:
-      - DESTINATION: "platform=iOS Simulator,name=iPhone 11 Pro"
-    # Define the steps required to build the project.
-    steps:
-      # Get the code from the VCS provider.
-      - checkout
-      - run:
-          name: Update Homebrew
-          command: brew update
-      - run:
-          name: Bootstrap Carthage
-          command: carthage bootstrap --platform ios
-      - run:
-          # More info about pre-start of the simulator at https://circleci.com/docs/2.0/testing-ios/#pre-starting-the-simulator
-          name: Pre-start simulator
-          command: xcrun instruments -w "iPhone 11 Pro (13.3) [" || true
-      - run:
-          name: Build framework
-          command: xcodebuild build -project MessageKit.xcodeproj -scheme MessageKit -destination "$DESTINATION" CODE_SIGNING_REQUIRED=NO | xcpretty -c
-      - run:
-          name: Build and run tests
-          command: xcodebuild test -project MessageKit.xcodeproj -scheme MessageKitTests -destination "$DESTINATION" CODE_SIGNING_REQUIRED=NO | xcpretty -c
-      - restore_cache:
-          name: Restore bundle cache
-          keys:
-            - 1-gems-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Gemfile.lock" }}
-            - 1-gems-{{ arch }}-{{ .Branch }}-
-      - run:
-          name: Install bundle
-          command: cd Example && bundle check || bundle install --path vendor/bundle
-      - save_cache:
-          name: Save bundle cache
-          key: 1-gems-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Gemfile.lock" }}
-          paths:
-            - vendor/bundle
-      - restore_cache:
-          name: Restore Pods cache
-          keys:
-            - v1-pods-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Podfile.lock" }}
-            - v1-pods-cache-{{ arch }}-{{ .Branch }}-
-      - run:
-          name: Update Pods
-          command: cd Example && bundle exec pod install
-      - save_cache:
-          name: Save Pods cache
-          paths:
-            - Pods
-          key: v1-pods-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Podfile.lock" }}
-      - run:
-          name: Build and analyze Example
-          command: xcodebuild build analyze -workspace Example/ChatExample.xcworkspace -scheme ChatExample -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c
-
-      # Collect XML test results data to show in the UI,
-      # and save the same XML files under test-results folder
-      # in the Artifacts tab.
-      #- store_test_results:
-      #    path: test_output/report.xml
-      #- store_artifacts:
-      #    path: /tmp/test-results
-      #    destination: scan-test-results
-      #- store_artifacts:
-      #    path: ~/Library/Logs/scan
-      #    destination: scan-logs
-
-workflows:
-  build_and_tests:
-    jobs:
-      - build_tests

Gemfile.lock

@@ -24,7 +24,7 @@ GEM
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-swiftlint (0.24.1)
+    danger-swiftlint (0.24.2)
       danger
       rake (> 10)
       thor (~> 0.19)
@@ -40,7 +40,7 @@ GEM
     multipart-post (2.1.1)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    octokit (4.16.0)
+    octokit (4.17.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
@@ -53,7 +53,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby