Commit f1411fc

committed

Merge branch 'nebhale-travis-ci' into Swift-1.2

2 parents 0b6ebf9 + 45021b3 commit f1411fcCopy full SHA for f1411fc

File tree

+24

-3

lines changed

+24

-3

lines changed

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+language: objective-c`
	`2`	`+xcode_project: ExSwift.xcodeproj`
	`3`	`+xcode_scheme:`
	`4`	`+- ExSwift-iOS`
	`5`	`+- ExSwift-OSX`
	`6`	`+xcode_sdk:`
	`7`	`+- iphonesimulator7`
	`8`	`+- iphonesimulator8.1`
	`9`	`+- macosx10.10`
	`10`	`+- macosx10.9`
	`11`	`+`
	`12`	`+matrix:`
	`13`	`+ exclude:`
	`14`	`+ - xcode_scheme: ExSwift-iOS`
	`15`	`+ xcode_sdk: macosx10.9`
	`16`	`+ - xcode_scheme: ExSwift-iOS`
	`17`	`+ xcode_sdk: macosx10.10`
	`18`	`+ - xcode_scheme: ExSwift-OSX`
	`19`	`+ xcode_sdk: iphonesimulator7`
	`20`	`+ - xcode_scheme: ExSwift-OSX`
	`21`	`+ xcode_sdk: iphonesimulator8.1`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@`
`846`	`846`	`);`
`847`	`847`	`INFOPLIST_FILE = ExSwift/Info.plist;`
`848`	`848`	`INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";`
`849`		`- IPHONEOS_DEPLOYMENT_TARGET = 8.0;`
	`849`	`+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;`
`850`	`850`	`LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";`
`851`	`851`	`MTL_ENABLE_DEBUG_INFO = YES;`
`852`	`852`	`PRODUCT_NAME = ExSwift;`
`@@ -869,7 +869,7 @@`
`869`	`869`	`GCC_NO_COMMON_BLOCKS = YES;`
`870`	`870`	`INFOPLIST_FILE = ExSwift/Info.plist;`
`871`	`871`	`INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";`
`872`		`- IPHONEOS_DEPLOYMENT_TARGET = 8.0;`
	`872`	`+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;`
`873`	`873`	`LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";`
`874`	`874`	`MTL_ENABLE_DEBUG_INFO = NO;`
`875`	`875`	`PRODUCT_NAME = ExSwift;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# ExSwift`
`2`		`-![CocoaPods](https://img.shields.io/cocoapods/v/ExSwift.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)`
	`2`	`+![CocoaPods](https://img.shields.io/cocoapods/v/ExSwift.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)[![Build Status](https://travis-ci.org/pNre/ExSwift.svg)](https://travis-ci.org/pNre/ExSwift)`
`3`	`3`
`4`	`4`	`Set of Swift extensions for standard types and classes.`
`5`	`5`

Comments

(0)