Skip to content

Commit f7001b3

Browse files
Merge pull request tristanhimmelman#129 from ikesyo/travis-xcode63
Update .travis.yml for Xcode 6.3 support
2 parents 00560ce + 661b006 commit f7001b3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: objective-c
2-
osx_image: xcode611
2+
osx_image: beta-xcode6.3
33

44
env:
55
global:
66
- LANG=en_US.UTF-8
77
- LC_ALL=en_US.UTF-8
88
- XCODE_WORKSPACE=ObjectMapper.xcworkspace
99
matrix:
10-
- SCRIPT="xctool -workspace $XCODE_WORKSPACE -scheme ObjectMapper-iOS -sdk iphonesimulator8.1 test"
10+
- SCRIPT="xctool -workspace $XCODE_WORKSPACE -scheme ObjectMapper-iOS -sdk iphonesimulator test"
1111
- SCRIPT="xctool -workspace $XCODE_WORKSPACE -scheme ObjectMapper-Mac test"
1212

1313
before_install:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ObjectMapper
22
============
33
[![CocoaPods](https://img.shields.io/cocoapods/v/ObjectMapper.svg)](https://github.com/Hearst-DD/ObjectMapper)
44
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
5-
<!-- [![Build Status](https://travis-ci.org/Hearst-DD/ObjectMapper.svg?branch=master)](https://travis-ci.org/Hearst-DD/ObjectMapper) -->
5+
[![Build Status](https://travis-ci.org/Hearst-DD/ObjectMapper.svg?branch=master)](https://travis-ci.org/Hearst-DD/ObjectMapper)
66

77
ObjectMapper is a framework written in Swift that makes it easy for you to convert your Model objects (Classes and Structs) to and from JSON.
88

0 commit comments

Comments
 (0)