Merge pull request #19 from RobotsAndPencils/swift4.2

Swift4.2

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build-test-lint:
     macos:
-      xcode: "9.4.1"
+      xcode: "10.0.0"
     environment:
       - BUNDLE_PATH: vendor/bundle
       - LC_ALL: en_US.UTF-8

Astro.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Astro"
-  s.version      = "5.1.0"
+  s.version      = "5.2.0"
   s.summary          = "A RoboPod containing a small collection of utilities for project reuse"
   s.homepage         = "https://RobotsAndPencils.com"
   s.license      = {
@@ -33,7 +33,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   s.ios.deployment_target = '9.0'
   s.platform     = :ios, '9.0'
   s.requires_arc = true
-  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
 
   s.subspec 'Logging' do | log |
     log.source_files = 'Astro/Logging/**/*.swift'

Astro.xcodeproj/project.pbxproj

@@ -286,7 +286,6 @@
 				638C62431BD454FD0004ECE1 /* Frameworks */,
 				638C62441BD454FD0004ECE1 /* Headers */,
 				638C62451BD454FD0004ECE1 /* Resources */,
-				434C28018B913E94E3422A3A /* [CP] Copy Pods Resources */,
 				63A5CA301F33C0E00062ED15 /* Run SwiftLint */,
 			);
 			buildRules = (
@@ -307,7 +306,6 @@
 				638C624E1BD454FD0004ECE1 /* Frameworks */,
 				638C624F1BD454FD0004ECE1 /* Resources */,
 				2D428D42B6F0E93D6F4FB498 /* [CP] Embed Pods Frameworks */,
-				9B92CE763EAC68888AFADCA6 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -398,21 +396,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AstroTests/Pods-AstroTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		434C28018B913E94E3422A3A /* [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-Astro/Pods-Astro-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		63A5CA301F33C0E00062ED15 /* Run SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -427,21 +410,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}\"/SwiftLint/swiftlint lint --config \".swiftlint.yml\"";
 		};
-		9B92CE763EAC68888AFADCA6 /* [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-AstroTests/Pods-AstroTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		C501F883BF7A2BA184E74035 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -659,7 +627,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -683,7 +651,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Astro.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>

Astro.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>

Astro/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>4.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Astro/UI/UIViewController+AstroGadgets.swift

@@ -25,9 +25,9 @@ public extension UIViewController {
      - parameter inContainer: the UIView where the childViewController's UIView will be added as a subview
     */
     public func addChildViewController(_ childViewController: UIViewController, inContainer view: UIView) {
-        self.addChildViewController(childViewController)
+        self.addChild(childViewController)
         view.addSubview(childViewController.view)
-        childViewController.didMove(toParentViewController: self)
+        childViewController.didMove(toParent: self)
     }
 }
 
@@ -43,8 +43,8 @@ public extension UIViewController {
      - parameter message: - of the alert
      */
     public func quickAlert(title: String?, message: String?) {
-        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert)
-        alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: nil))
+        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.Style.alert)
+        alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
         present(alert, animated: true, completion: nil)
     }
 

Podfile

@@ -16,6 +16,6 @@ target 'Astro' do
 	  inherit! :search_paths
 
 	  pod 'Quick', '~> 1.2'
-	  pod 'Nimble', '~> 7.0.2', :inhibit_warnings => true
+	  pod 'Nimble', '~> 7.3.1', :inhibit_warnings => true
 	end
 end

Podfile.lock

@@ -1,34 +1,40 @@
 PODS:
-  - Astro (4.1.0):
-    - Astro/Logging (= 4.1.0)
-    - Astro/Security (= 4.1.0)
-    - Astro/UI (= 4.1.0)
-    - Astro/Utils (= 4.1.0)
-  - Astro/Logging (4.1.0)
-  - Astro/Security (4.1.0):
+  - Astro (5.2.0):
+    - Astro/Logging (= 5.2.0)
+    - Astro/Security (= 5.2.0)
+    - Astro/UI (= 5.2.0)
+    - Astro/Utils (= 5.2.0)
+  - Astro/Logging (5.2.0)
+  - Astro/Security (5.2.0):
     - Astro/Logging
-  - Astro/UI (4.1.0)
-  - Astro/Utils (4.1.0)
-  - Nimble (7.0.2)
-  - Quick (1.2.0)
-  - SwiftLint (0.23.1)
+  - Astro/UI (5.2.0)
+  - Astro/Utils (5.2.0)
+  - Nimble (7.3.1)
+  - Quick (1.3.2)
+  - SwiftLint (0.27.0)
 
 DEPENDENCIES:
   - Astro (from `.`)
-  - Nimble (~> 7.0.2)
+  - Nimble (~> 7.3.1)
   - Quick (~> 1.2)
   - SwiftLint (~> 0.22)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Nimble
+    - Quick
+    - SwiftLint
+
 EXTERNAL SOURCES:
   Astro:
-    :path: .
+    :path: "."
 
 SPEC CHECKSUMS:
-  Astro: 3ea870f467cd109678da5aaf97f1267abef42d87
-  Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
-  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  SwiftLint: 1b670ce79284c76520f84060e87d645078fd32fa
+  Astro: 44cf3928eac701a28540a0b3ad4d5f61cf5c0d83
+  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
+  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
+  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
 
-PODFILE CHECKSUM: b17f02f9e43c6d131960e704533c9dbe49d42a70
+PODFILE CHECKSUM: 4c2e3656ceb47235c954ccf6a23748fcc6184637
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3