Skip to content

Commit

Permalink
Merge pull request #67 from hyperoslo/fix/mac-target
Browse files Browse the repository at this point in the history
Fix Mac target
  • Loading branch information
onmyway133 committed Apr 3, 2016
2 parents 32d5eb9 + 26c2308 commit 5c0d752
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
16 changes: 6 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
osx_image: xcode7.3
language: objective-c
cache: cocoapods
before_install: gem install cocoapods obcd slather -N

# Use when you don't have third party dependencies
script: xctool -project Pod/Pod.xcodeproj -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test

# Use when you have third party dependencies (CocoaPods generates a workspace)
# podfile: Pod/Podfile
# script: xctool -workspace Pod/Pod.xcworkspace -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test

after_success: slather
script:
- xcodebuild clean build -project Sugar.xcodeproj -scheme Sugar-iOS -sdk iphonesimulator
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-iOS -sdk iphonesimulator
- xcodebuild clean build -project Sugar.xcodeproj -scheme Sugar-Mac -sdk macosx
- xcodebuild test -project Sugar.xcodeproj -scheme Sugar-Mac -sdk macosx
2 changes: 2 additions & 0 deletions Sugar.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
39D4BC281C9C2DDE005D6EC0 /* String+Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D4BC271C9C2DDE005D6EC0 /* String+Validation.swift */; };
39DBAEB71CA5BE550060291F /* String+Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39DBAEB61CA5BE550060291F /* String+Empty.swift */; };
39FAD61F1CA59371009BD40C /* UIView+Frame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39FAD61E1CA59371009BD40C /* UIView+Frame.swift */; };
BD0D88FB1CB18BF100CDA2C6 /* NSDate+Compare.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D4BC211C9C2A6E005D6EC0 /* NSDate+Compare.swift */; };
BD0E01C81C3BCFD50092C477 /* GrandCentralDispatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0E01C71C3BCFD50092C477 /* GrandCentralDispatch.swift */; };
BD0E01C91C3BCFD50092C477 /* GrandCentralDispatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0E01C71C3BCFD50092C477 /* GrandCentralDispatch.swift */; };
BD0E01CB1C3BCFEF0092C477 /* Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0E01CA1C3BCFEF0092C477 /* Localization.swift */; };
Expand Down Expand Up @@ -499,6 +500,7 @@
D52D72441C3BDEA5009A4426 /* Swizzler.swift in Sources */,
BD37B4F11C2C08430069CD4A /* String+CoreFoundation.swift in Sources */,
BD0E01CC1C3BCFEF0092C477 /* Localization.swift in Sources */,
BD0D88FB1CB18BF100CDA2C6 /* NSDate+Compare.swift in Sources */,
BDAF15631C3917110008A5D6 /* Then.swift in Sources */,
BD0E01C91C3BCFD50092C477 /* GrandCentralDispatch.swift in Sources */,
BDA447BE1C294729003FDEAD /* Array+Queueable.swift in Sources */,
Expand Down

0 comments on commit 5c0d752

Please sign in to comment.