Merge branch 'master' into controller-connectables

Author: kmcbride

.github/workflows/ci.yaml

@@ -10,36 +10,19 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-carthage-${{ hashFiles('Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-carthage-
-    - name: Build and Test
-      run: Tools/ci-xcode.sh
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  spm:
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v2
     - name: Build and Test
       run: Tools/ci-spm.sh
       env:
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   swiftlint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: GitHub Action for SwiftLint
-      uses: norio-nomura/action-swiftlint@3.0.1
+      uses: norio-nomura/action-swiftlint@3.2.1
       with:
         args: lint --no-cache --strict

.swiftformat

@@ -9,7 +9,7 @@
 --exponentcase lowercase
 --exponentgrouping disabled
 --fractiongrouping enabled
---header "// Copyright (c) 2019 Spotify AB.\n//\n// Licensed to the Apache Software Foundation (ASF) under one\n// or more contributor license agreements.  See the NOTICE file\n// distributed with this work for additional information\n// regarding copyright ownership.  The ASF licenses this file\n// to you under the Apache License, Version 2.0 (the\n// \"License\"); you may not use this file except in compliance\n// with the License.  You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing,\n// software distributed under the License is distributed on an\n// \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n// KIND, either express or implied.  See the License for the\n// specific language governing permissions and limitations\n// under the License."
+--header "// Copyright Spotify AB.\n// SPDX-License-Identifier: Apache-2.0"
 --hexgrouping none
 --hexliteralcase lowercase
 --ifdef noindent
@@ -34,4 +34,4 @@
 --symlinks ignore
 
 # Excluded directories
---exclude Carthage
+--exclude Carthage,MobiusTest/Source/SimpleDiff.swift,Templates

.swiftlint.yml

@@ -5,11 +5,9 @@ disabled_rules:
   - superfluous_disable_command # Disabled since we disable some rules pre-emptively to avoid issues in the future
   - todo                        # Disabled while we are filling out the framework; re-enable when we get closer to completion
   - nesting                     # Does not make sense anymore since Swift 4 uses nested `CodingKeys` enums for example
-
   - implicit_return             # Suddenly started firing for existing code on PRs, should investigate later
 
 opt_in_rules:
-  - anyobject_protocol
   - attributes
   - closure_end_indentation
   - closure_spacing
@@ -29,7 +27,6 @@ opt_in_rules:
   - first_where
   - identical_operands
   - implicit_return
-  - inert_defer
   - joined_default_parameter
   - literal_expression_end_indentation
   - legacy_hashing
@@ -55,6 +52,7 @@ opt_in_rules:
   - trailing_whitespace
   - unneeded_parentheses_in_closure_argument
   - vertical_parameter_alignment_on_call
+  - weak_delegate
   - yoda_condition
 
 excluded:
@@ -71,8 +69,8 @@ attributes:
     - "@NSManaged"
     - "@objc"
 closure_spacing: warning
-empty_count: warning
-explicit_init: warning
+empty_count:
+  severity: warning
 fatal_error_message: warning
 file_header:
   severity: warning