diff --git a/.travis.yml b/.travis.yml
index 8899c440c9..34d81c0ee8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode7
 before_install:
   - brew update
   - brew reinstall xctool
diff --git a/build.sh b/build.sh
index 55980eb7b6..2c0bc6dab5 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # **** Update me when new Xcode versions are released! ****
-PLATFORM="platform=iOS Simulator,OS=8.1,name=iPhone 6"
-SDK="iphonesimulator8.1"
+PLATFORM="platform=iOS Simulator,OS=9.0,name=iPhone 6"
+SDK="iphonesimulator9.0"
 
 
 # It is pitch black.
diff --git a/examples/Swift/Sample.xcodeproj/project.pbxproj b/examples/Swift/Sample.xcodeproj/project.pbxproj
index 36632d7d46..10ad4f7308 100644
--- a/examples/Swift/Sample.xcodeproj/project.pbxproj
+++ b/examples/Swift/Sample.xcodeproj/project.pbxproj
@@ -129,6 +129,7 @@
 		050E7C6619D22E19004363C2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
diff --git a/examples/Swift/Sample/ViewController.swift b/examples/Swift/Sample/ViewController.swift
index 9801a20523..037e0965e8 100644
--- a/examples/Swift/Sample/ViewController.swift
+++ b/examples/Swift/Sample/ViewController.swift
@@ -27,7 +27,7 @@ class ViewController: UIViewController, ASTableViewDataSource, ASTableViewDelega
     self.tableView.asyncDelegate = self
   }
 
-  required init(coder aDecoder: NSCoder) {
+  required init?(coder aDecoder: NSCoder) {
     fatalError("storyboards are incompatible with truth and beauty")
   }