Merge pull request #671 from Adlai-Holler/xcode-7

appleguy · appleguy · commit 406bcfaa0db7 · 2015-12-25T15:55:49.000-08:00
Enable Xcode 7 by default for Travis build server.
diff --git 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
@@ -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
@@ -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
@@ -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")
   }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class ViewController: UIViewController, ASTableViewDataSource, ASTableViewDelega`
`27`	`27`	`self.tableView.asyncDelegate = self`
`28`	`28`	`}`
`29`	`29`
`30`		`- required init(coder aDecoder: NSCoder) {`
	`30`	`+ required init?(coder aDecoder: NSCoder) {`
`31`	`31`	`fatalError("storyboards are incompatible with truth and beauty")`
`32`	`32`	`}`
`33`	`33`