Merge pull request #180 from layoutBox/update_pods_swift_4_2

lucdion · web-flow · commit ff672b7ec562 · 2018-10-31T08:07:40.000-04:00
Update Sample app to Swift 4.2
diff --git a/.gitignore b/.gitignore
@@ -8,11 +8,6 @@ data/
 
 Pods/
 
-docs/1.2
-fastlane/README.md
-fastlane/report.xml
-fastlane/test_output
-
 TestProjects/cocoapods/ios/PinLayout-iOS.xcworkspace/
 TestProjects/cocoapods/macos/PinLayout-macOS.xcworkspace/
 TestProjects/cocoapods/tvos/PinLayout-tvOS.xcworkspace/
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10
 
 cache:
   - bundler
diff --git a/Example/PinLayoutSample.xcodeproj/project.pbxproj b/Example/PinLayoutSample.xcodeproj/project.pbxproj
@@ -104,6 +104,7 @@
 			remoteInfo = "PinLayoutTests-tvOS";
 		};
 /* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
 		241637701F8E4BC200EE703A /* IntroObjectiveCViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntroObjectiveCViewController.h; sourceTree = "<group>"; };
 		241637711F8E4BC200EE703A /* IntroObjectiveCViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntroObjectiveCViewController.m; sourceTree = "<group>"; };
@@ -509,6 +510,7 @@
 				TargetAttributes = {
 					249EFE3E1E64FAFE00165E39 = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -617,7 +619,7 @@
 			inputPaths = (
 				"${SRCROOT}/../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-17/iOS/RevealServer.framework",
+				"${PODS_ROOT}/Reveal-SDK/RevealServer-18/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -843,7 +845,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -860,7 +862,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/Example/PinLayoutSample/AppDelegate.swift b/Example/PinLayoutSample/AppDelegate.swift
@@ -24,7 +24,7 @@ import PinLayout
 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 {
 
         window = UIWindow(frame: UIScreen.main.bounds)
         window!.backgroundColor = UIColor.white
diff --git a/Example/PinLayoutSample/UI/Common/BaseFormView.swift b/Example/PinLayoutSample/UI/Common/BaseFormView.swift
@@ -32,8 +32,8 @@ class BaseFormView: UIView {
         formScrollView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTapScrollView)))
         addSubview(formScrollView)
         
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: .UIKeyboardWillShow, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: .UIKeyboardWillHide, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
     }
 
     required init(coder aDecoder: NSCoder) {
@@ -52,7 +52,7 @@ class BaseFormView: UIView {
 
     @objc
     internal func keyboardWillShow(notification: Notification) {
-        guard let sizeValue = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? NSValue else { return }
+        guard let sizeValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue else { return }
         setFormScrollView(bottomInset: sizeValue.cgRectValue.height)
     }
 
diff --git a/Example/PinLayoutSample/UI/Examples/TableViewExample/Cells/MethodCell.swift b/Example/PinLayoutSample/UI/Examples/TableViewExample/Cells/MethodCell.swift
@@ -28,7 +28,7 @@ class MethodCell: UITableViewCell {
     private let descriptionLabel = UILabel()
     private let padding: CGFloat = 10
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
         selectionStyle = .none
diff --git a/Example/PinLayoutSample/UI/Examples/TableViewExample/TableViewExampleView.swift b/Example/PinLayoutSample/UI/Examples/TableViewExample/TableViewExampleView.swift
@@ -81,6 +81,6 @@ extension TableViewExampleView: UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         // The UITableView will call the cell's sizeThatFit() method to compute the height.
         // WANRING: You must also set the UITableView.estimatedRowHeight for this to work.
-        return UITableViewAutomaticDimension
+        return UITableView.automaticDimension
     }
 }
diff --git a/Example/PinLayoutSample/UI/Examples/TableViewReadableContent/Cells/MethodReadableInsetsCell.swift b/Example/PinLayoutSample/UI/Examples/TableViewReadableContent/Cells/MethodReadableInsetsCell.swift
@@ -8,7 +8,7 @@ class MethodReadableInsetsCell: UITableViewCell {
     private let descriptionLabel = UILabel()
     private let margin: CGFloat = 10
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
         selectionStyle = .none
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
-gem 'synx'
-gem 'cocoapods', '~> 1.5.3'
+gem 'cocoapods', '~> 1.6.0.beta.2'
 gem 'jazzy', '0.9'
-gem 'fastlane'
 gem 'xcpretty-travis-formatter'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,37 +7,33 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
     atomos (0.1.3)
-    babosa (1.0.2)
     claide (1.0.2)
-    clamp (0.6.5)
-    cocoapods (1.5.3)
+    cocoapods (1.6.0.beta.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
+      cocoapods-core (= 1.6.0.beta.2)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.3, >= 1.3.1)
+      xcodeproj (>= 1.7.0, < 2.0)
+    cocoapods-core (1.6.0.beta.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -46,86 +42,13 @@ GEM
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
-    colored (1.2)
     colored2 (3.1.2)
-    colorize (0.8.1)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.5.0)
-    emoji_regex (0.1.1)
     escape (0.0.4)
-    excon (0.62.0)
-    faraday (0.15.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
-      http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.4)
-    fastlane (2.97.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
-      babosa (>= 1.0.2, < 2.0.0)
-      bundler (>= 1.12.0, < 2.0.0)
-      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (~> 0.1)
-      excon (>= 0.45.0, < 1.0.0)
-      faraday (~> 0.9)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.9)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.22.0)
-      highline (>= 1.7.2, < 2.0.0)
-      json (< 3.0.0)
-      mini_magick (~> 4.5.1)
-      multi_json
-      multi_xml (~> 0.5)
-      multipart-post (~> 2.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.1, < 2.0.0)
-      security (= 0.1.3)
-      simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
-      terminal-notifier (>= 1.6.2, < 2.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.7, < 2.0.0)
-      xcpretty (>= 0.2.4, < 1.0.0)
-      xcpretty-travis-formatter (>= 0.0.3)
     ffi (1.9.25)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-api-client (0.21.2)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-    googleauth (0.6.6)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    highline (1.7.10)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jazzy (0.9.0)
@@ -137,79 +60,32 @@ GEM
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (2.1.0)
-    jwt (2.1.0)
     liferaft (0.0.6)
-    memoist (0.16.0)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_magick (4.5.1)
     minitest (5.11.3)
     molinillo (0.6.6)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
     mustache (0.99.8)
     nanaimo (0.2.6)
     nap (1.1.0)
-    naturally (2.2.0)
     netrc (0.11.0)
     open4 (1.3.4)
-    os (1.0.0)
-    plist (3.4.0)
-    public_suffix (2.0.5)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
     rouge (1.11.1)
-    ruby-macho (1.2.0)
-    rubyzip (1.2.2)
+    ruby-macho (1.3.1)
     sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    security (0.1.3)
-    signet (0.10.0)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.5)
-      CFPropertyList
-      naturally
-    slack-notifier (2.3.2)
     sqlite3 (1.3.13)
-    synx (0.2.1)
-      clamp (~> 0.6)
-      colorize (~> 0.7)
-      xcodeproj (~> 1.0)
-    terminal-notifier (1.8.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-cursor (0.6.0)
-    tty-screen (0.6.5)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
-    word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.6.0)
+    xcodeproj (1.7.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -224,11 +100,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.5.3)
-  fastlane
+  cocoapods (~> 1.6.0.beta.2)
   jazzy (= 0.9)
-  synx
   xcpretty-travis-formatter
 
 BUNDLED WITH
-   1.16.3
+   1.17.1
diff --git a/PinLayout.xcodeproj/project.pbxproj b/PinLayout.xcodeproj/project.pbxproj
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/build-ci.sh b/build-ci.sh
diff --git a/fastlane/Fastfile b/fastlane/Fastfile

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@ extension TableViewExampleView: UITableViewDataSource, UITableViewDelegate {`
`81`	`81`	`func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {`
`82`	`82`	`// The UITableView will call the cell's sizeThatFit() method to compute the height.`
`83`	`83`	`// WANRING: You must also set the UITableView.estimatedRowHeight for this to work.`
`84`		`- return UITableViewAutomaticDimension`
	`84`	`+ return UITableView.automaticDimension`
`85`	`85`	`}`
`86`	`86`	`}`