Merge pull request #22 from yacir/project-update

yacir · web-flow · commit 3f38187f4374 · 2018-09-25T21:00:19.000+02:00
Updates to build specs with Xcode10 / Swift 4.2
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -2,7 +2,7 @@ module: CollectionViewSlantedLayout
 author: Yassir Barchi
 author_url: http://yassir.fr
 github_url: https://github.com/yacir/CollectionViewSlantedLayout
-swift_version: 4.0
+swift_version: 4.2
 exclude: Sources/Internal/*,Sources/Extentions/*
 readme: README.md
 output: docs
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode9.2
+osx_image: xcode10
 
 language: objective-c
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CollectionViewSlantedLayout CHANGELOG
 
+## 3.x.x (mm/dd/2018)
+
+* Updates to build specs with Xcode10 / Swift 4.2
+
 ## 3.0.1 (01/04/2018)
 
 * Fixes typo for `isFirstCellExcluded` property, closes #5
diff --git a/CollectionViewSlantedLayout.xcodeproj/project.pbxproj b/CollectionViewSlantedLayout.xcodeproj/project.pbxproj
@@ -200,7 +200,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Yassir Barchi";
 				TargetAttributes = {
 					FB0AE5E41C910B3200821862 = {
@@ -312,12 +312,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -368,12 +370,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -423,7 +427,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -443,7 +447,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -455,7 +459,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = YB.YBSlantedCollectionViewLayoutTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -467,7 +471,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = YB.YBSlantedCollectionViewLayoutTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/CollectionViewSlantedLayout.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CollectionViewSlantedLayout.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/CollectionViewSlantedLayout.xcodeproj/xcshareddata/xcschemes/CollectionViewSlantedLayout.xcscheme b/CollectionViewSlantedLayout.xcodeproj/xcshareddata/xcschemes/CollectionViewSlantedLayout.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0940"
    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/Examples/CollectionViewSlantedLayoutDemo.xcodeproj/project.pbxproj b/Examples/CollectionViewSlantedLayoutDemo.xcodeproj/project.pbxproj
@@ -138,7 +138,6 @@
 				FB1735891C83A0B400EEDB5F /* Resources */,
 				FB132C761C91135E00728981 /* CopyFiles */,
 				6DF225E9B9A30B644E491F10 /* [CP] Embed Pods Frameworks */,
-				C75FB944EDACBA78C8213A9E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -156,12 +155,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Yassir Barchi";
 				TargetAttributes = {
 					FB17358A1C83A0B400EEDB5F = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -234,21 +233,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CollectionViewSlantedLayoutDemo/Pods-CollectionViewSlantedLayoutDemo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C75FB944EDACBA78C8213A9E /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CollectionViewSlantedLayoutDemo/Pods-CollectionViewSlantedLayoutDemo-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -297,12 +281,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -329,11 +315,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -349,12 +336,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -375,10 +364,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -389,13 +379,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = "$(SRCROOT)/CollectionViewSlantedLayoutDemo/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yb.CollectionViewSlantedLayout.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -405,13 +394,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = "$(SRCROOT)/CollectionViewSlantedLayoutDemo/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yb.CollectionViewSlantedLayout.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/Examples/CollectionViewSlantedLayoutDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/CollectionViewSlantedLayoutDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Examples/CollectionViewSlantedLayoutDemo/AppDelegate.swift b/Examples/CollectionViewSlantedLayoutDemo/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
diff --git a/Examples/CollectionViewSlantedLayoutDemo/Base.lproj/Main.storyboard b/Examples/CollectionViewSlantedLayoutDemo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="T6q-sR-erc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="T6q-sR-erc">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -108,7 +108,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <items>
                                 <navigationItem id="P8I-Pe-KHZ">
-                                    <barButtonItem key="rightBarButtonItem" style="plain" systemItem="done" id="zpi-3l-vvU">
+                                    <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="zpi-3l-vvU">
                                         <connections>
                                             <action selector="done:" destination="dL7-SW-xMJ" id="Tv5-eb-a9A"/>
                                         </connections>
@@ -211,7 +211,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Exclude the first cell" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="R08-nR-wKc">
-                                                    <rect key="frame" x="16" y="16" width="161" height="16"/>
+                                                    <rect key="frame" x="16" y="15" width="161" height="16"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
diff --git a/Examples/CollectionViewSlantedLayoutDemo/SettingsController.swift b/Examples/CollectionViewSlantedLayoutDemo/SettingsController.swift
@@ -34,8 +34,6 @@ class SettingsController: UITableViewController {
         self.lastCellSlantingSwitch.isOn = self.collectionViewLayout.isLastCellExcluded
         self.slantingSizeSlider.value = Float(self.collectionViewLayout.slantingSize)
         self.lineSpacingSlider.value = Float(self.collectionViewLayout.lineSpacing)
-        
-        UIApplication.shared.setStatusBarHidden(false, with: UIStatusBarAnimation.slide)
     }
     
     override var prefersStatusBarHidden : Bool {
diff --git a/Examples/Podfile b/Examples/Podfile
@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '9.0'
 
 target 'CollectionViewSlantedLayoutDemo' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - CollectionViewSlantedLayout (3.0.0)
+  - CollectionViewSlantedLayout (3.0.1)
 
 DEPENDENCIES:
   - CollectionViewSlantedLayout (from `../`)
 
 EXTERNAL SOURCES:
   CollectionViewSlantedLayout:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  CollectionViewSlantedLayout: 07ae5f0c6e82129c967e7c3606f5f39213999eb5
+  CollectionViewSlantedLayout: 351451242ec148a932d340b5c9ecee7ede4cc9c8
 
-PODFILE CHECKSUM: bf4b53868714c919a28bd891dba088bd12bd7918
+PODFILE CHECKSUM: 784530443c4e94767488f5a14b699ce4f4b357bb
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 </p>
 
 <p align="center">
-    <img src="https://img.shields.io/badge/Swift-4.0-orange.svg" alt="Swift 4.0"/>
+    <img src="https://img.shields.io/badge/Swift-4.2-orange.svg" alt="Swift 4.2"/>
     <a href="https://cocoapods.org/pods/CollectionViewSlantedLayout">
         <img src="https://img.shields.io/cocoapods/v/CollectionViewSlantedLayout.svg?style=flat)"/>
     </a>
diff --git a/Sources/CollectionViewSlantedLayout.swift b/Sources/CollectionViewSlantedLayout.swift
@@ -77,7 +77,7 @@ import UIKit
      The grid layout scrolls along one axis only, either horizontally or vertically.
      The default value of this property is `vertical`.
      */
-    @objc open var scrollDirection: UICollectionViewScrollDirection = .vertical {
+    @objc open var scrollDirection: UICollectionView.ScrollDirection = .vertical {
         didSet {
             updateRotationAngle()
             invalidateLayout()
diff --git a/Sources/Extensions/UICollectionView+Helpers.swift b/Sources/Extensions/UICollectionView+Helpers.swift
@@ -24,7 +24,7 @@
 
 import UIKit
 
-extension UICollectionViewScrollDirection {
+extension UICollectionView.ScrollDirection {
 
     var isVertical: Bool {
         return self == .vertical
diff --git a/Tests/CollectionViewSlantedLayoutTests.swift b/Tests/CollectionViewSlantedLayoutTests.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-osx_image: xcode9.2`
	`1`	`+osx_image: xcode10`
`2`	`2`
`3`	`3`	`language: objective-c`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`14`	`14`	`var window: UIWindow?`
`15`	`15`
`16`	`16`
`17`		`- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {`
	`17`	`+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {`
`18`	`18`	`// Override point for customization after application launch.`
`19`	`19`	`return true`
`20`	`20`	`}`