Merge pull request #111 from jakubvano/xcode10_on_ci

Xcode10 on ci

.swift-version

@@ -1 +1 @@
-4.0.3
+4.2

.travis.yml

@@ -1,7 +1,7 @@
 # reference: http://www.objc.io/issue-6/travis-ci.html
 
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode10
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
@@ -17,7 +17,7 @@ env:
     - DESTINATION="arch=x86_64" SCHEME="SwinjectStoryboard-OSX" SDK="macosx" POD_LINT="NO" ACTION="test"
     - DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" POD_LINT="NO" ACTION="test"
     - DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" POD_LINT="NO" ACTION="test"
-    - DESTINATION="OS=11.0,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" POD_LINT="NO" ACTION="test"
+    - DESTINATION="OS=12.0,name=Apple TV 4K" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" POD_LINT="NO" ACTION="test"
 before_install:
   - curl -L -O https://github.com/Carthage/Carthage/releases/download/0.28.0/Carthage.pkg
   - sudo installer -pkg Carthage.pkg -target /
@@ -26,12 +26,10 @@ before_install:
 script:
   - set -o pipefail
   - xcodebuild -version
-  - open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040
   - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" 
     -configuration Release ENABLE_TESTABILITY=YES ONLY_ACTIVE_ARCH=NO $ACTION | xcpretty
   - if [ $POD_LINT == "YES" ]; then
-      pod repo update;
-      pod lib lint;
+      bundle exec pod lib lint;
     fi
 notifications:
   email:

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v7.0.3"
-github "Quick/Quick" "v1.2.0"
-github "Swinject/Swinject" "2.4.0"
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"
+github "Swinject/Swinject" "2.5.0"

Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "cocoapods", "1.6.0.beta.1"

Gemfile.lock

@@ -0,0 +1,76 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.0)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    atomos (0.1.3)
+    claide (1.0.2)
+    cocoapods (1.6.0.beta.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.6.0.beta.1)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.1, < 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.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.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.2)
+      xcodeproj (>= 1.6.0, < 2.0)
+    cocoapods-core (1.6.0.beta.1)
+      activesupport (>= 4.0.2, < 6)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.3.1)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.1.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
+    escape (0.0.4)
+    fourflusher (2.0.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    netrc (0.11.0)
+    ruby-macho (1.3.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    xcodeproj (1.6.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
+  cocoapods (= 1.6.0.beta.1)
+
+BUNDLED WITH
+   1.16.4

SwinjectStoryboard.xcodeproj/project.pbxproj

@@ -1060,7 +1060,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1080,7 +1080,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";

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

Tests/OSX/AnimalPagesViewController.swift

@@ -14,7 +14,7 @@ internal class AnimalPagesViewController: NSPageController {
 
     required init?(coder aDecoder: NSCoder) {
         animalPage = NSStoryboard(
-            name: NSStoryboard.Name(rawValue: "Pages"),
+            name: NSStoryboard.Name("Pages"),
             bundle: Bundle(for: AnimalPagesViewController.self)
         ).instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("AnimalPage")) as! AnimalViewController
 

Tests/OSX/SwinjectStoryboardSpec.swift

@@ -56,8 +56,13 @@ class SwinjectStoryboardSpec: QuickSpec {
 
                 let storyboard = SwinjectStoryboard.create(name: .tabs, bundle: bundle, container: container)
                 let tabBarController = storyboard.instantiateController(withIdentifier: .tabBarController) as! NSTabViewController
+            #if swift(>=4.2)
+                let animalViewController1 = tabBarController.children[0] as! AnimalViewController
+                let animalViewController2 = tabBarController.children[1] as! AnimalViewController
+            #else
                 let animalViewController1 = tabBarController.childViewControllers[0] as! AnimalViewController
                 let animalViewController2 = tabBarController.childViewControllers[1] as! AnimalViewController
+            #endif
                 let cat1 = animalViewController1.animal as! Cat
                 let cat2 = animalViewController2.animal as! Cat
                 expect(cat1 === cat2).to(beTrue()) // Workaround for crash in Nimble.

Tests/iOS-tvOS/SwinjectStoryboardSpec.swift

@@ -46,8 +46,13 @@ class SwinjectStoryboardSpec: QuickSpec {
 
                 let storyboard = SwinjectStoryboard.create(name: "Tabs", bundle: bundle, container: container)
                 let tabBarController = storyboard.instantiateViewController(withIdentifier: "TabBarController")
+            #if swift(>=4.2)
+                let animalViewController1 = tabBarController.children[0] as! AnimalViewController
+                let animalViewController2 = tabBarController.children[1] as! AnimalViewController
+            #else
                 let animalViewController1 = tabBarController.childViewControllers[0] as! AnimalViewController
                 let animalViewController2 = tabBarController.childViewControllers[1] as! AnimalViewController
+            #endif
                 let cat1 = animalViewController1.animal as! Cat
                 let cat2 = animalViewController2.animal as! Cat
                 expect(cat1 === cat2).to(beTrue()) // Workaround for crash in Nimble.