Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Travis use Xcode 7 #671

Merged
merged 3 commits into from
Dec 25, 2015
Merged

Travis use Xcode 7 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f12162
Bump SDK in build.sh
Adlai-Holler Sep 19, 2015
a14267e
Bump the .travis.yml OS X image requirement for Xcode 7
Adlai-Holler Sep 17, 2015
a1236a9
Update Swift example
Adlai-Holler Sep 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: objective-c
osx_image: xcode7
before_install:
- brew update
- brew reinstall xctool
Expand Down
4 changes: 2 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions examples/Swift/Sample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
050E7C6619D22E19004363C2 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0600;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
Expand Down
2 changes: 1 addition & 1 deletion examples/Swift/Sample/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down