Migrate swift version 4.0 to 4.1 (#223)

nbadakh · staguer · commit 1a5f86b6bb65 · 2018-08-02T14:30:40.000-07:00
* Changes from flatmap to compactMap

* Removed the weak applied protocol properties
Changed LazyMapRandomAccessCollection to LazyMapCollection

* Updated xcode project settings to 9.3

* Made travis use xcode9.3 image

* Updated the swift version to 4.1

* Updated the swift version to 4.1 for:
LayoutKit-iOS.xcodeproj/project.pbxproj
LayoutKit-macOS.xcodeproj/project.pbxproj
LayoutKit-tvOS.xcodeproj/project.pbxproj

* Use the iphonesimulator11.3
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.3
 script: sh build.sh /tmp/LayoutKit
 after_success:
   - bash <(curl -s https://codecov.io/bash) -D /tmp/LayoutKit
diff --git a/LayoutKit.xcodeproj/project.pbxproj b/LayoutKit.xcodeproj/project.pbxproj
@@ -1151,7 +1151,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					0B2D09AF1D8735E1007E487C = {
 						CreatedOnToolsVersion = 8.0;
@@ -1781,11 +1781,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -1802,7 +1804,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Debug;
 		};
@@ -1813,11 +1815,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -1832,7 +1836,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Release;
 		};
diff --git a/LayoutKit.xcodeproj/xcshareddata/xcschemes/ExampleLayouts-iOS.xcscheme b/LayoutKit.xcodeproj/xcshareddata/xcschemes/ExampleLayouts-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKit-iOS.xcscheme b/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKit-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKit-macOS.xcscheme b/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKit-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKit-tvOS.xcscheme b/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKit-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKitObjC-iOS.xcscheme b/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKitObjC-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKitSampleApp.xcscheme b/LayoutKit.xcodeproj/xcshareddata/xcschemes/LayoutKitSampleApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/LayoutKitSampleApp/NestedCollectionViewController.swift b/LayoutKitSampleApp/NestedCollectionViewController.swift
@@ -55,7 +55,7 @@ class NestedCollectionViewController: UIViewController {
     }
 
     // Static to avoid capturing a reference to self
-    private static func sectionLayout(sectionIndex: Int, count: Int) -> [Section<LazyMapRandomAccessCollection<CountableRange<Int>, Layout>>] {
+    private static func sectionLayout(sectionIndex: Int, count: Int) -> [Section<LazyMapCollection<CountableRange<Int>, Layout>>] {
         let items = (0..<count).lazy.map { rowIndex -> Layout in
             let text = "\(sectionIndex)-\(rowIndex) " + String(repeating: "long word ", count: rowIndex)
             let urlText = text.replacingOccurrences(of: " ", with: "+")
diff --git a/LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift b/LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift
@@ -134,7 +134,7 @@ private class TestCollectionView: LayoutAdapterCollectionView, TestableReloadabl
                 return label.text
             }
 
-            let supplementaryViewTexts = visibleSupplementaryViews(ofKind: kind).flatMap(labelText)
+            let supplementaryViewTexts = visibleSupplementaryViews(ofKind: kind).compactMap(labelText)
             if let text = text {
                 XCTAssertTrue(supplementaryViewTexts.contains(text), file: file, line: line)
             }
diff --git a/Sources/Layouts/SizeLayout.swift b/Sources/Layouts/SizeLayout.swift
@@ -264,7 +264,7 @@ open class SizeLayout<V: View>: BaseLayout<V>, ConfigurableLayout {
         // Make sure that our size is in the desired range.
         let size = sublayoutSize.increasedToSize(CGSize(width: minWidth ?? 0, height: minHeight ?? 0)).decreasedToSize(availableSize)
 
-        let sublayouts = [sublayoutMeasurement].flatMap { $0 }
+        let sublayouts = [sublayoutMeasurement].compactMap { $0 }
         return LayoutMeasurement(layout: self, size: size, maxSize: maxSize, sublayouts: sublayouts)
     }
 
diff --git a/Sources/Layouts/StackLayout.swift b/Sources/Layouts/StackLayout.swift
@@ -117,7 +117,7 @@ extension StackLayout: ConfigurableLayout {
             }
         }
 
-        let nonNilMeasuredSublayouts = sublayoutMeasurements.flatMap { $0 }
+        let nonNilMeasuredSublayouts = sublayoutMeasurements.compactMap { $0 }
 
         if distribution == .fillEqualSize && !nonNilMeasuredSublayouts.isEmpty {
             let maxAxisLength = nonNilMeasuredSublayouts.map({ AxisSize(axis: axis, size: $0.size).axisLength }).max() ?? 0
diff --git a/Sources/Views/ReloadableViewUpdateManager.swift b/Sources/Views/ReloadableViewUpdateManager.swift
@@ -18,12 +18,12 @@ protocol ReloadableViewUpdateManagerDelegate: class {
 protocol ReloadableViewUpdateManager {
 
     /// The delegate that this manager performs updates on.
-    weak var delegate: ReloadableViewUpdateManagerDelegate? { get }
+    var delegate: ReloadableViewUpdateManagerDelegate? { get }
 
     /// The operation that this update manager is associated with.
     /// The update manager will stop updating the delegate
     /// if the operation is cancelled or dellocated.
-    weak var operation: Operation? { get }
+    var operation: Operation? { get }
 
     /// Applies a partial arrangement to the delegate's reloadable view and data source.
     func apply(partialArrangement arrangement: [Section<[LayoutArrangement]>], insertedIndexPaths: [IndexPath])
diff --git a/Tests/cocoapods/ios/LayoutKit-iOS.xcodeproj/project.pbxproj b/Tests/cocoapods/ios/LayoutKit-iOS.xcodeproj/project.pbxproj
@@ -307,7 +307,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Debug;
 		};
@@ -320,7 +320,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Release;
 		};
diff --git a/Tests/cocoapods/macos/LayoutKit-macOS.xcodeproj/project.pbxproj b/Tests/cocoapods/macos/LayoutKit-macOS.xcodeproj/project.pbxproj
@@ -310,7 +310,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-macOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Debug;
 		};
@@ -325,7 +325,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-macOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Release;
 		};
diff --git a/Tests/cocoapods/tvos/LayoutKit-tvOS.xcodeproj/project.pbxproj b/Tests/cocoapods/tvos/LayoutKit-tvOS.xcodeproj/project.pbxproj
@@ -304,7 +304,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.linkedin.LayoutKit-tvOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Debug;
 		};
@@ -316,7 +316,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.linkedin.LayoutKit-tvOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.1;
 			};
 			name = Release;
 		};
diff --git a/build.sh b/build.sh
@@ -12,12 +12,12 @@ rm -rf $DERIVED_DATA &&
 time xcodebuild clean test \
     -project LayoutKit.xcodeproj \
     -scheme LayoutKit-iOS \
-    -sdk iphonesimulator11.0 \
+    -sdk iphonesimulator11.3 \
     -derivedDataPath $DERIVED_DATA \
     -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3.1' \
     -destination 'platform=iOS Simulator,name=iPhone 6 Plus,OS=10.3.1' \
-    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.0' \
-    -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.0' \
+    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
+    -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.3' \
     OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \
     | tee build.log \
     | xcpretty &&
@@ -39,7 +39,7 @@ rm -rf $DERIVED_DATA &&
 time xcodebuild clean test \
     -project LayoutKit.xcodeproj \
     -scheme LayoutKit-tvOS \
-    -sdk appletvsimulator11.0 \
+    -sdk appletvsimulator11.3 \
     -derivedDataPath $DERIVED_DATA \
     -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=11.0' \
     OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \
@@ -52,12 +52,12 @@ rm -rf $DERIVED_DATA &&
 time xcodebuild clean build \
     -project LayoutKit.xcodeproj \
     -scheme LayoutKitSampleApp \
-    -sdk iphonesimulator11.0 \
+    -sdk iphonesimulator11.3 \
     -derivedDataPath $DERIVED_DATA \
     -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3.1' \
     -destination 'platform=iOS Simulator,name=iPhone 6 Plus,OS=10.3.1' \
-        -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.0' \
-    -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.0' \
+    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
+    -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.3' \
     OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \
     | tee ../build.log \
     | xcpretty &&
@@ -72,9 +72,9 @@ pod install &&
 time xcodebuild clean build \
     -workspace LayoutKit-iOS.xcworkspace \
     -scheme LayoutKit-iOS \
-    -sdk iphonesimulator11.0 \
+    -sdk iphonesimulator11.3 \
     -derivedDataPath $DERIVED_DATA \
-    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.0' \
+    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \
     OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \
     | tee ../../../build.log \
     | xcpretty &&
@@ -103,7 +103,7 @@ pod install &&
 time xcodebuild clean build \
     -workspace LayoutKit-tvOS.xcworkspace \
     -scheme LayoutKit-tvOS \
-    -sdk appletvsimulator11.0 \
+    -sdk appletvsimulator11.3 \
     -derivedDataPath $DERIVED_DATA \
     -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=11.0' \
     OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class NestedCollectionViewController: UIViewController {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// Static to avoid capturing a reference to self`
`58`		`- private static func sectionLayout(sectionIndex: Int, count: Int) -> [Section<LazyMapRandomAccessCollection<CountableRange<Int>, Layout>>] {`
	`58`	`+ private static func sectionLayout(sectionIndex: Int, count: Int) -> [Section<LazyMapCollection<CountableRange<Int>, Layout>>] {`
`59`	`59`	`let items = (0..<count).lazy.map { rowIndex -> Layout in`
`60`	`60`	`let text = "\(sectionIndex)-\(rowIndex) " + String(repeating: "long word ", count: rowIndex)`
`61`	`61`	`let urlText = text.replacingOccurrences(of: " ", with: "+")`