Merge pull request #30 from ww-tech/sgrosmark/feature/ios14

Tweaks for iOS 14 & Xcode 12

Author: g-mark

.circleci/config.yml

@@ -20,13 +20,16 @@ commands:
           keys:
             - gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
             - gem-cache-v1-{{ arch }}-{{ .Branch }}
+      - run:
+          name: Configure bundler
+          command: bundle config set path ~/vendor/bundle
       - run:
           name: Install dependencies in Gemfile
-          command: bundle install --path vendor/bundle
+          command: bundle install
       - save_cache:
           key: gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
           paths:
-            - vendor/bundle
+            - ~/vendor/bundle
 
   # Installs all dependencies needed for a job
   install_dependencies:
@@ -59,7 +62,7 @@ jobs:
   build-gem-cache:
     <<: *defaults
     macos:
-      xcode: 10.3.0
+      xcode: 11.3.0
     steps:
       - checkout
       - setup_ruby
@@ -109,6 +112,20 @@ jobs:
           swift: '5.2'
           device: 'iPhone XS'
 
+  build-and-test-swift53:
+    <<: *defaults
+    macos:
+      xcode: 12.0.0
+    steps:
+      - checkout
+      - install_dependencies
+      - build:
+          swift: '5.3'
+          device: 'iPhone 8'
+      - build:
+          swift: '5.3'
+          device: 'iPhone SE'
+
   build-and-test-swiftpm:
     <<: *defaults
     macos:
@@ -139,6 +156,9 @@ workflows:
       - build-and-test-swift52:
           requires:
             - build-gem-cache
+      - build-and-test-swift53:
+          requires:
+            - build-gem-cache
       - build-and-test-swiftpm:
           requires:
             - build-gem-cache

Gemfile

@@ -1,4 +1,4 @@
 # Gemfile
 source 'https://rubygems.org'
 
-gem 'slather', '>= 2.4.7'
+#gem 'slather', '>= 2.4.7'

Gemfile.lock

@@ -1,45 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    atomos (0.1.3)
-    claide (1.0.3)
-    clamp (1.3.1)
-    colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nanaimo (0.2.6)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    slather (2.4.7)
-      CFPropertyList (>= 2.2, < 4)
-      activesupport (>= 4.0.2, < 5)
-      clamp (~> 1.3)
-      nokogiri (~> 1.8)
-      xcodeproj (~> 1.7)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    xcodeproj (1.15.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  slather (>= 2.4.7)
 
 BUNDLED WITH
    2.1.4

Sources/WWLayout/Anchorable.swift

@@ -104,14 +104,14 @@ public enum SpecialAnchorable {
             return superview
 
         case .margins:
-            // constraing a view to margins means constraining it to it's superview's layoutMarginsGuide
+            // constraining a view to margins means constraining it to it's superview's layoutMarginsGuide
             if superview.next == nil {
                 print("WARNING: using .margins, but view hasn't been added to the view hierarchy yet - layout will fail pre iOS 11")
             }
             return superview.layoutMarginsGuide
 
         case .safeArea:
-            // constraing a view to safeArea means constraining it to it's superview's safeAreaLayoutGuide
+            // constraining a view to safeArea means constraining it to it's superview's safeAreaLayoutGuide
             if #available(iOS 11.0, *), #available(tvOS 11.0, *) {
                 return superview.safeAreaLayoutGuide
             }

Tests/WWLayoutTests/SizeClassTests.swift

@@ -185,6 +185,17 @@ class SizeClassTests: XCTestCase {
         XCTAssertAllEqual(compactConstraints.map { $0.isActive }, true)
     }
 
+    #if compiler(>=5.3)
+    private func XCTAssertAllEqual<T: Equatable>(_ a: [T],
+                                                 _ expected: T,
+                                                 _ message: @autoclosure () -> String = "",
+                                                 file: StaticString = #filePath,
+                                                 line: UInt = #line) {
+        for value in a {
+            XCTAssertEqual(value, expected, message(), file: file, line: line)
+        }
+    }
+    #else
     private func XCTAssertAllEqual<T: Equatable>(_ a: [T],
                                                  _ expected: T,
                                                  _ message: @autoclosure () -> String = "",
@@ -194,6 +205,7 @@ class SizeClassTests: XCTestCase {
             XCTAssertEqual(value, expected, message(), file: file, line: line)
         }
     }
+    #endif
 
     private func override(horizontal: UIUserInterfaceSizeClass, vertical: UIUserInterfaceSizeClass) {
         let previous = controller.traitCollection

WWLayout.xcodeproj/project.pbxproj

@@ -234,7 +234,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0910;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "WW International, Inc.";
 				TargetAttributes = {
 					798F251F1FD18FA4006E6A44 = {
@@ -388,6 +388,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -451,6 +452,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

WWLayout.xcodeproj/xcshareddata/xcschemes/WWLayout.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

WWLayoutExample/WWLayoutExample.xcodeproj/project.pbxproj

@@ -165,7 +165,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0910;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "WW International, Inc.";
 				TargetAttributes = {
 					798F25501FD190AB006E6A44 = {
@@ -308,6 +308,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -367,6 +368,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

WWLayoutExample/WWLayoutExample.xcodeproj/xcshareddata/xcschemes/WWLayoutExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"