Merge pull request #33 from ww-tech/sgrosmark/2021updates

Bring project files up to date
ww-tech · Feb 6, 2021 · 8f816e5 · 8f816e5
2 parents de0819a + 4cdf429
commit 8f816e5
Show file tree

Hide file tree

Showing 56 changed files with 377 additions and 170 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -4,15 +4,15 @@
 # Find all the available rules by running:
 # swiftlint rules
 
-# rules to exclude from running
-disabled_rules:
+disabled_rules: # rule identifiers to exclude from running
   - identifier_name
+  - line_length
   - no_extension_access_modifier
-  - statement_position # a.k.a. cuddled else
+  - statement_position
   - shorthand_operator
+  - multiple_closures_with_trailing_closure
 
-# rules that must run
-opt_in_rules:
+opt_in_rules: # some rules are only opt-in
   - anyobject_protocol
   - collection_alignment
   - closure_spacing
@@ -34,6 +34,7 @@ opt_in_rules:
   - empty_string
   - empty_xctest_method
   - explicit_init
+  - first_where
   - force_cast
   - force_try
   - force_unwrapping
@@ -47,6 +48,7 @@ opt_in_rules:
   - multiline_parameters
   - no_space_in_method_call
   - opening_brace
+  - operator_usage_whitespace
   - overridden_super_call
   - prohibited_super_call
   - redundant_discardable_let
@@ -70,10 +72,6 @@ custom_rules:
     name: "No space after opening parentheses"
     message: "Please avoid using space after opening parentheses"
     regex: '\(\h+'
-  no_space_before_closing_parentheses:
-    name: "No space before closing parentheses"
-    message: "Please avoid using space before closing parentheses"
-    regex: '\h+\)'
 
   anonymous_init:
     name: "Anonymous init()"
@@ -105,8 +103,6 @@ function_parameter_count:
   warning: 6
   error: 9
 
-line_length: 160
-
 nesting:
   type_level:
     warning: 3 # default is 1
@@ -116,18 +112,22 @@ trailing_whitespace:
 
 type_body_length:
   warning: 500 # default is 200
-  error: 600 # default is 350
+  error: 1000 # default is 350
 
 unused_setter_value: error
 
+
 #---
 #--- Paths
 
 #included: # paths to include during linting. `--path` is ignored if present.
 #  - ../Pod
+# In ios-common-config, the path to the sources will be done via the --path argument
 
-# excluded: # paths to ignore during linting. Takes precedence over `included`.
-#   - ./vendor
-#   - ./fastlane
+excluded: # paths to ignore during linting. Takes precedence over `included`.
+  - ./Example/Pods
+  - ./Pods
+  - ./vendor
+  - ./fastlane
 
 reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, junit, html, emoji)
diff --git a/Sources/WWLayout/Anchorable.swift b/Sources/WWLayout/Anchorable.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Anchorable.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/Insets.swift b/Sources/WWLayout/Insets.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Insets.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/Layout+Activate.swift b/Sources/WWLayout/Layout+Activate.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Layout+Activate.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/Layout+Center.swift b/Sources/WWLayout/Layout+Center.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Layout+Center.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/Layout+Edges.swift b/Sources/WWLayout/Layout+Edges.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Layout+Edges.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/Layout+Fill.swift b/Sources/WWLayout/Layout+Fill.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Layout+Fill.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit
@@ -292,7 +292,15 @@ extension Layout {
                           priority: LayoutPriority? = nil,
                           tag: Int? = nil,
                           active: Bool? = nil) -> Layout {
-        return fillWidth(of: special.anchorable(with: view), inset: Insets(inset), maximum: maximum, alignTo: edge, priority: priority, tag: tag, active: active)
+        return fillWidth(
+            of: special.anchorable(with: view),
+            inset: Insets(inset),
+            maximum: maximum,
+            alignTo: edge,
+            priority: priority,
+            tag: tag,
+            active: active
+        )
     }
 
     /// Set the view so it fills the width of another view, with a maximum allowed width.
@@ -308,7 +316,15 @@ extension Layout {
                           priority: LayoutPriority? = nil,
                           tag: Int? = nil,
                           active: Bool? = nil) -> Layout {
-        return fillWidth(of: special.anchorable(with: view), inset: Insets(inset), maximum: maximum, alignTo: edge, priority: priority, tag: tag, active: active)
+        return fillWidth(
+            of: special.anchorable(with: view),
+            inset: Insets(inset),
+            maximum: maximum,
+            alignTo: edge,
+            priority: priority,
+            tag: tag,
+            active: active
+        )
     }
 
 }
diff --git a/Sources/WWLayout/Layout+Size.swift b/Sources/WWLayout/Layout+Size.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Layout+Size.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/Layout.swift b/Sources/WWLayout/Layout.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  Layout.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/LayoutAnchor.swift b/Sources/WWLayout/LayoutAnchor.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  LayoutAnchor.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/LayoutAxis.swift b/Sources/WWLayout/LayoutAxis.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  LayoutAxis.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit

diff --git a/Sources/WWLayout/LayoutConstraint.swift b/Sources/WWLayout/LayoutConstraint.swift
@@ -1,5 +1,5 @@
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 //  LayoutConstraint.swift
 //
@@ -11,7 +11,7 @@
 //
 //     https://github.com/ww-tech/wwlayout
 //
-//  Copyright © 2017-2018 WW International, Inc.
+//  Copyright © 2017-2021 WW International, Inc.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-//===----------------------------------------------------------------------===//
+// ===----------------------------------------------------------------------===//
 //
 
 import UIKit