From b1c0c87c573d4049dd78187b753e92756b10bd81 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 03:22:00 +0200 Subject: [PATCH 1/9] Use Carthage instead of CocoaPods for test project --- .travis.yml | 12 +- Cartfile.private | 2 + Cartfile.resolved | 2 + Tailor.xcodeproj/project.pbxproj | 318 ++------------------ Tailor.xcworkspace/contents.xcworkspacedata | 10 - bin/bootstrap | 4 + bin/bootstrap-if-needed | 5 + 7 files changed, 50 insertions(+), 303 deletions(-) create mode 100644 Cartfile.private create mode 100644 Cartfile.resolved delete mode 100644 Tailor.xcworkspace/contents.xcworkspacedata create mode 100755 bin/bootstrap create mode 100755 bin/bootstrap-if-needed diff --git a/.travis.yml b/.travis.yml index c1b96f9..5f780fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ -osx_image: xcode8 +osx_image: xcode8.2 language: objective-c +cache: + directories: + - Carthage + before_install: -- gem install xcpretty -- brew update -- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi -- travis_wait 25 pod repo update --silent -- pod install + - travis_wait 35; bin/bootstrap-if-needed script: - xcodebuild clean build -workspace Tailor.xcworkspace -scheme Tailor-iOS -sdk iphonesimulator | xcpretty diff --git a/Cartfile.private b/Cartfile.private new file mode 100644 index 0000000..e7e7d7d --- /dev/null +++ b/Cartfile.private @@ -0,0 +1,2 @@ +github "Quick/Nimble" +github "Quick/Quick" diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..83bc29d --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,2 @@ +github "Quick/Nimble" "v7.0.0" +github "Quick/Quick" "v1.1.0" diff --git a/Tailor.xcodeproj/project.pbxproj b/Tailor.xcodeproj/project.pbxproj index 988ce41..533b262 100644 --- a/Tailor.xcodeproj/project.pbxproj +++ b/Tailor.xcodeproj/project.pbxproj @@ -7,11 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1C622A05F481425950532E9E /* Pods_Tailor_iOS_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C61C7CDC9AD5231D24DBE38 /* Pods_Tailor_iOS_Tests.framework */; }; - 4207F288DC1485ED466A2956 /* Pods_Tailor_tvOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A946469CD56C6E316C7E19C7 /* Pods_Tailor_tvOSTests.framework */; }; - 65EA805108D30D1A13534893 /* Pods_Tailor_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E231ECA1B955215D4AD0BC6F /* Pods_Tailor_iOS.framework */; }; - 99D81E0E74780D3615825097 /* Pods_Tailor_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9354BE59A88DE31401E8E8E /* Pods_Tailor_tvOS.framework */; }; - B4F5C52578E6D0AEDCF4C93D /* Pods_Tailor_Mac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EAF486508A9975067636BF1 /* Pods_Tailor_Mac.framework */; }; BD793D481C3FCC97002BBB5F /* Tailor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD793D471C3FCC97002BBB5F /* Tailor.swift */; }; BD793D551C3FCFA2002BBB5F /* Tailor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD793D471C3FCC97002BBB5F /* Tailor.swift */; }; BD81A1421C73A493009955E3 /* Dictionary+Tailor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD81A1411C73A493009955E3 /* Dictionary+Tailor.swift */; }; @@ -52,7 +47,6 @@ BDC182671C3FE45000B54DD7 /* TestMappable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDC182621C3FE45000B54DD7 /* TestMappable.swift */; }; BDC182681C3FE45000B54DD7 /* TestSubjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDC182631C3FE45000B54DD7 /* TestSubjects.swift */; }; BDC182691C3FE45000B54DD7 /* TestSubjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDC182631C3FE45000B54DD7 /* TestSubjects.swift */; }; - C8466FCC3B998E5ED1FDB1DF /* Pods_Tailor_Mac_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9154804E3DED65759EA320C /* Pods_Tailor_Mac_Tests.framework */; }; D22829E71CCA2ECF00466A1C /* PathAccessible.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22829E61CCA2ECF00466A1C /* PathAccessible.swift */; }; D22829E81CCA2ECF00466A1C /* PathAccessible.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22829E61CCA2ECF00466A1C /* PathAccessible.swift */; }; D2E827DA1CAD25FA003151A6 /* TestAccessible.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E827D91CAD25FA003151A6 /* TestAccessible.swift */; }; @@ -94,20 +88,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2AAF859ABE93DD6EDA4073E8 /* Pods-Tailor-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-iOS/Pods-Tailor-iOS.debug.xcconfig"; sourceTree = ""; }; - 331A9A1B614AB571158B2E50 /* Pods-Tailor-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-tvOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-tvOSTests/Pods-Tailor-tvOSTests.debug.xcconfig"; sourceTree = ""; }; - 3C61C7CDC9AD5231D24DBE38 /* Pods_Tailor_iOS_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tailor_iOS_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3EAF486508A9975067636BF1 /* Pods_Tailor_Mac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tailor_Mac.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6FBE2AED5EB3171DF69FDFFE /* Pods-Tailor-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-iOS/Pods-Tailor-iOS.release.xcconfig"; sourceTree = ""; }; - 7C93A225D742098FA635FEAC /* Pods-Tailor-Mac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-Mac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-Mac/Pods-Tailor-Mac.debug.xcconfig"; sourceTree = ""; }; - 96770F2E3E684C4634E2D624 /* Pods-Tailor-Mac-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-Mac-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-Mac-Tests/Pods-Tailor-Mac-Tests.debug.xcconfig"; sourceTree = ""; }; - A7F0175C2BF9EA296A0A5212 /* Pods-Tailor-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-tvOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-tvOS/Pods-Tailor-tvOS.release.xcconfig"; sourceTree = ""; }; - A9354BE59A88DE31401E8E8E /* Pods_Tailor_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tailor_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A946469CD56C6E316C7E19C7 /* Pods_Tailor_tvOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tailor_tvOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - AFB4C29625EE5B05CCB5D1CA /* Pods-Tailor-Mac.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-Mac.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-Mac/Pods-Tailor-Mac.release.xcconfig"; sourceTree = ""; }; - B5EEC838CE811496E53D66D0 /* Pods-Tailor-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-tvOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-tvOS/Pods-Tailor-tvOS.debug.xcconfig"; sourceTree = ""; }; - B6031E69E43FACC81F76398F /* Pods-Tailor-iOS-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-iOS-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-iOS-Tests/Pods-Tailor-iOS-Tests.debug.xcconfig"; sourceTree = ""; }; - B822B1B77E5389BAC5C42AE8 /* Pods-Tailor-iOS-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-iOS-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-iOS-Tests/Pods-Tailor-iOS-Tests.release.xcconfig"; sourceTree = ""; }; BD793D471C3FCC97002BBB5F /* Tailor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tailor.swift; sourceTree = ""; }; BD81A1411C73A493009955E3 /* Dictionary+Tailor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+Tailor.swift"; sourceTree = ""; }; BD81A1441C73A49D009955E3 /* Array+Tailor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Tailor.swift"; sourceTree = ""; }; @@ -123,8 +103,6 @@ BDC182611C3FE45000B54DD7 /* TestInspectable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestInspectable.swift; sourceTree = ""; }; BDC182621C3FE45000B54DD7 /* TestMappable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestMappable.swift; sourceTree = ""; }; BDC182631C3FE45000B54DD7 /* TestSubjects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSubjects.swift; sourceTree = ""; }; - C5660B94EB3B30130DB092B1 /* Pods-Tailor-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-tvOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-tvOSTests/Pods-Tailor-tvOSTests.release.xcconfig"; sourceTree = ""; }; - CD43880063DB7A922C9948DD /* Pods-Tailor-Mac-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tailor-Mac-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tailor-Mac-Tests/Pods-Tailor-Mac-Tests.release.xcconfig"; sourceTree = ""; }; D22829E61CCA2ECF00466A1C /* PathAccessible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PathAccessible.swift; sourceTree = ""; }; D2E827D91CAD25FA003151A6 /* TestAccessible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestAccessible.swift; sourceTree = ""; }; D2F488751CCDFFC7005DD009 /* HierarchyType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HierarchyType.swift; sourceTree = ""; }; @@ -140,8 +118,6 @@ D5C6298C1C3A8BBD007F7B7C /* Info-Mac.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-Mac.plist"; sourceTree = ""; }; D5C629901C3A8BDA007F7B7C /* Info-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = ""; }; D5C629911C3A8BDA007F7B7C /* Info-Mac.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-Mac.plist"; sourceTree = ""; }; - E231ECA1B955215D4AD0BC6F /* Pods_Tailor_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tailor_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F9154804E3DED65759EA320C /* Pods_Tailor_Mac_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tailor_Mac_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -149,7 +125,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 99D81E0E74780D3615825097 /* Pods_Tailor_tvOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -158,7 +133,6 @@ buildActionMask = 2147483647; files = ( BDA0DFE91D93F9E600D299BE /* Tailor.framework in Frameworks */, - 4207F288DC1485ED466A2956 /* Pods_Tailor_tvOSTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -166,7 +140,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 65EA805108D30D1A13534893 /* Pods_Tailor_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -175,7 +148,6 @@ buildActionMask = 2147483647; files = ( D5B2E8AA1C3A780C00C0327D /* Tailor.framework in Frameworks */, - 1C622A05F481425950532E9E /* Pods_Tailor_iOS_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -183,7 +155,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B4F5C52578E6D0AEDCF4C93D /* Pods_Tailor_Mac.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -192,45 +163,12 @@ buildActionMask = 2147483647; files = ( D5C6294A1C3A7FAA007F7B7C /* Tailor.framework in Frameworks */, - C8466FCC3B998E5ED1FDB1DF /* Pods_Tailor_Mac_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 65149D41E552422ED91C1C3C /* Pods */ = { - isa = PBXGroup; - children = ( - 7C93A225D742098FA635FEAC /* Pods-Tailor-Mac.debug.xcconfig */, - AFB4C29625EE5B05CCB5D1CA /* Pods-Tailor-Mac.release.xcconfig */, - 96770F2E3E684C4634E2D624 /* Pods-Tailor-Mac-Tests.debug.xcconfig */, - CD43880063DB7A922C9948DD /* Pods-Tailor-Mac-Tests.release.xcconfig */, - 2AAF859ABE93DD6EDA4073E8 /* Pods-Tailor-iOS.debug.xcconfig */, - 6FBE2AED5EB3171DF69FDFFE /* Pods-Tailor-iOS.release.xcconfig */, - B6031E69E43FACC81F76398F /* Pods-Tailor-iOS-Tests.debug.xcconfig */, - B822B1B77E5389BAC5C42AE8 /* Pods-Tailor-iOS-Tests.release.xcconfig */, - B5EEC838CE811496E53D66D0 /* Pods-Tailor-tvOS.debug.xcconfig */, - A7F0175C2BF9EA296A0A5212 /* Pods-Tailor-tvOS.release.xcconfig */, - 331A9A1B614AB571158B2E50 /* Pods-Tailor-tvOSTests.debug.xcconfig */, - C5660B94EB3B30130DB092B1 /* Pods-Tailor-tvOSTests.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; - 92E2564D2BF8FB972585459A /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3EAF486508A9975067636BF1 /* Pods_Tailor_Mac.framework */, - F9154804E3DED65759EA320C /* Pods_Tailor_Mac_Tests.framework */, - E231ECA1B955215D4AD0BC6F /* Pods_Tailor_iOS.framework */, - 3C61C7CDC9AD5231D24DBE38 /* Pods_Tailor_iOS_Tests.framework */, - A9354BE59A88DE31401E8E8E /* Pods_Tailor_tvOS.framework */, - A946469CD56C6E316C7E19C7 /* Pods_Tailor_tvOSTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; BD81A13E1C73A468009955E3 /* Extensions */ = { isa = PBXGroup; children = ( @@ -269,8 +207,6 @@ D5C6295C1C3A800E007F7B7C /* Tailor */, D5C6298F1C3A8BDA007F7B7C /* TailorTests */, D5B2E8A01C3A780C00C0327D /* Products */, - 65149D41E552422ED91C1C3C /* Pods */, - 92E2564D2BF8FB972585459A /* Frameworks */, ); sourceTree = ""; }; @@ -388,13 +324,11 @@ isa = PBXNativeTarget; buildConfigurationList = BDA0DFD21D93F91E00D299BE /* Build configuration list for PBXNativeTarget "Tailor-tvOS" */; buildPhases = ( - 155F68E3D7681D82B2A56F0A /* [CP] Check Pods Manifest.lock */, BDA0DFC61D93F91E00D299BE /* Sources */, BDA0DFC71D93F91E00D299BE /* Frameworks */, BDA0DFC81D93F91E00D299BE /* Headers */, BDA0DFC91D93F91E00D299BE /* Resources */, BD892C141DF4BDB200EE2620 /* SwiftLint */, - F80327164DDDBC658B28C9A3 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -409,12 +343,10 @@ isa = PBXNativeTarget; buildConfigurationList = BDA0DFEC1D93F9E600D299BE /* Build configuration list for PBXNativeTarget "Tailor-tvOSTests" */; buildPhases = ( - 7B09BFA1E94A791D8DF11E82 /* [CP] Check Pods Manifest.lock */, BDA0DFE01D93F9E600D299BE /* Sources */, BDA0DFE11D93F9E600D299BE /* Frameworks */, BDA0DFE21D93F9E600D299BE /* Resources */, - 729081F359C6E75B467F6A30 /* [CP] Embed Pods Frameworks */, - 0D1F242954DB94E793BE303D /* [CP] Copy Pods Resources */, + BD04A1151EC3F31800823679 /* ShellScript */, ); buildRules = ( ); @@ -430,13 +362,11 @@ isa = PBXNativeTarget; buildConfigurationList = D5B2E8B31C3A780C00C0327D /* Build configuration list for PBXNativeTarget "Tailor-iOS" */; buildPhases = ( - CB1BE821358E5521A981BA0F /* [CP] Check Pods Manifest.lock */, D5B2E89A1C3A780C00C0327D /* Sources */, D5B2E89B1C3A780C00C0327D /* Frameworks */, D5B2E89C1C3A780C00C0327D /* Headers */, D5B2E89D1C3A780C00C0327D /* Resources */, BD892C121DF4BD1000EE2620 /* SwiftLint */, - 8715AF38C3AFD263463813B8 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -451,12 +381,10 @@ isa = PBXNativeTarget; buildConfigurationList = D5B2E8B61C3A780C00C0327D /* Build configuration list for PBXNativeTarget "Tailor-iOS-Tests" */; buildPhases = ( - D22D861EE47D804FE4A2915E /* [CP] Check Pods Manifest.lock */, D5B2E8A51C3A780C00C0327D /* Sources */, D5B2E8A61C3A780C00C0327D /* Frameworks */, D5B2E8A71C3A780C00C0327D /* Resources */, - 043B5DDFBAAC7CC052765690 /* [CP] Embed Pods Frameworks */, - 6E390A173D854A0F8F01A223 /* [CP] Copy Pods Resources */, + BD04A1131EC3F2E500823679 /* ShellScript */, ); buildRules = ( ); @@ -472,13 +400,11 @@ isa = PBXNativeTarget; buildConfigurationList = D5C629511C3A7FAA007F7B7C /* Build configuration list for PBXNativeTarget "Tailor-Mac" */; buildPhases = ( - 205B134C9A06DF85F44ACC26 /* [CP] Check Pods Manifest.lock */, D5C6293B1C3A7FAA007F7B7C /* Sources */, D5C6293C1C3A7FAA007F7B7C /* Frameworks */, D5C6293D1C3A7FAA007F7B7C /* Headers */, D5C6293E1C3A7FAA007F7B7C /* Resources */, BD892C131DF4BDA500EE2620 /* SwiftLint */, - 49D79B56F31B8CD2A0C19E7F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -493,12 +419,10 @@ isa = PBXNativeTarget; buildConfigurationList = D5C629541C3A7FAA007F7B7C /* Build configuration list for PBXNativeTarget "Tailor-Mac-Tests" */; buildPhases = ( - 9E2AB4D0BA94BA0E58D88BC3 /* [CP] Check Pods Manifest.lock */, D5C629451C3A7FAA007F7B7C /* Sources */, D5C629461C3A7FAA007F7B7C /* Frameworks */, D5C629471C3A7FAA007F7B7C /* Resources */, - 3957F435028F9D213834E968 /* [CP] Embed Pods Frameworks */, - 5AF3C720020C5EC2A85E2007 /* [CP] Copy Pods Resources */, + BD04A1141EC3F30100823679 /* ShellScript */, ); buildRules = ( ); @@ -610,185 +534,50 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 043B5DDFBAAC7CC052765690 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-iOS-Tests/Pods-Tailor-iOS-Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 0D1F242954DB94E793BE303D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-tvOSTests/Pods-Tailor-tvOSTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 155F68E3D7681D82B2A56F0A /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 205B134C9A06DF85F44ACC26 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 3957F435028F9D213834E968 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-Mac-Tests/Pods-Tailor-Mac-Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 49D79B56F31B8CD2A0C19E7F /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-Mac/Pods-Tailor-Mac-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 5AF3C720020C5EC2A85E2007 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-Mac-Tests/Pods-Tailor-Mac-Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 6E390A173D854A0F8F01A223 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-iOS-Tests/Pods-Tailor-iOS-Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 729081F359C6E75B467F6A30 /* [CP] Embed Pods Frameworks */ = { + BD04A1131EC3F2E500823679 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "$(SRCROOT)/Carthage/Build/iOS/Quick.framework", + "$(SRCROOT)/Carthage/Build/iOS/Nimble.framework", ); - name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-tvOSTests/Pods-Tailor-tvOSTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/usr/local/bin/carthage copy-frameworks"; }; - 7B09BFA1E94A791D8DF11E82 /* [CP] Check Pods Manifest.lock */ = { + BD04A1141EC3F30100823679 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "$(SRCROOT)/Carthage/Build/Mac/Quick.framework", + "$(SRCROOT)/Carthage/Build/Mac/Nimble.framework", ); - name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; + shellScript = "/usr/local/bin/carthage copy-frameworks"; }; - 8715AF38C3AFD263463813B8 /* [CP] Copy Pods Resources */ = { + BD04A1151EC3F31800823679 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "$(SRCROOT)/Carthage/Build/tvOS/Quick.framework", + "$(SRCROOT)/Carthage/Build/tvOS/Nimble.framework", ); - name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-iOS/Pods-Tailor-iOS-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 9E2AB4D0BA94BA0E58D88BC3 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; + shellScript = "/usr/local/bin/carthage copy-frameworks"; }; BD892C121DF4BD1000EE2620 /* SwiftLint */ = { isa = PBXShellScriptBuildPhase; @@ -832,51 +621,6 @@ shellPath = /bin/sh; shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; - CB1BE821358E5521A981BA0F /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - D22D861EE47D804FE4A2915E /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - F80327164DDDBC658B28C9A3 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tailor-tvOS/Pods-Tailor-tvOS-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -996,7 +740,6 @@ /* Begin XCBuildConfiguration section */ BDA0DFD01D93F91E00D299BE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B5EEC838CE811496E53D66D0 /* Pods-Tailor-tvOS.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = ""; @@ -1021,7 +764,6 @@ }; BDA0DFD11D93F91E00D299BE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A7F0175C2BF9EA296A0A5212 /* Pods-Tailor-tvOS.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = ""; @@ -1046,7 +788,6 @@ }; BDA0DFED1D93F9E600D299BE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 331A9A1B614AB571158B2E50 /* Pods-Tailor-tvOSTests.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = ""; @@ -1062,7 +803,6 @@ }; BDA0DFEE1D93F9E600D299BE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C5660B94EB3B30130DB092B1 /* Pods-Tailor-tvOSTests.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = ""; @@ -1172,7 +912,6 @@ }; D5B2E8B41C3A780C00C0327D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2AAF859ABE93DD6EDA4073E8 /* Pods-Tailor-iOS.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1195,7 +934,6 @@ }; D5B2E8B51C3A780C00C0327D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6FBE2AED5EB3171DF69FDFFE /* Pods-Tailor-iOS.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1217,10 +955,12 @@ }; D5B2E8B71C3A780C00C0327D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B6031E69E43FACC81F76398F /* Pods-Tailor-iOS-Tests.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); INFOPLIST_FILE = "$(SRCROOT)/TailorTests/Info-iOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = no.hyper.TailorTests; @@ -1232,10 +972,12 @@ }; D5B2E8B81C3A780C00C0327D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B822B1B77E5389BAC5C42AE8 /* Pods-Tailor-iOS-Tests.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); INFOPLIST_FILE = "$(SRCROOT)/TailorTests/Info-iOS.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = no.hyper.TailorTests; @@ -1246,7 +988,6 @@ }; D5C629521C3A7FAA007F7B7C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7C93A225D742098FA635FEAC /* Pods-Tailor-Mac.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; @@ -1272,7 +1013,6 @@ }; D5C629531C3A7FAA007F7B7C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AFB4C29625EE5B05CCB5D1CA /* Pods-Tailor-Mac.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; @@ -1297,12 +1037,14 @@ }; D5C629551C3A7FAA007F7B7C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 96770F2E3E684C4634E2D624 /* Pods-Tailor-Mac-Tests.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); INFOPLIST_FILE = "$(SRCROOT)/TailorTests/Info-Mac.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -1316,12 +1058,14 @@ }; D5C629561C3A7FAA007F7B7C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CD43880063DB7A922C9948DD /* Pods-Tailor-Mac-Tests.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); INFOPLIST_FILE = "$(SRCROOT)/TailorTests/Info-Mac.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; diff --git a/Tailor.xcworkspace/contents.xcworkspacedata b/Tailor.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 03f04d8..0000000 --- a/Tailor.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/bin/bootstrap b/bin/bootstrap new file mode 100755 index 0000000..d08c0b5 --- /dev/null +++ b/bin/bootstrap @@ -0,0 +1,4 @@ +#!/bin/sh + +carthage bootstrap +cp Cartfile.resolved Carthage diff --git a/bin/bootstrap-if-needed b/bin/bootstrap-if-needed new file mode 100755 index 0000000..c49a31d --- /dev/null +++ b/bin/bootstrap-if-needed @@ -0,0 +1,5 @@ +#!/bin/sh + +if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then + bin/bootstrap +fi From c5dd08f473d3c8d59586ff10a22147ab1c137a8e Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 03:31:16 +0200 Subject: [PATCH 2/9] Update travis.yml --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f780fc..6e4665c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,12 @@ before_install: - travis_wait 35; bin/bootstrap-if-needed script: -- xcodebuild clean build -workspace Tailor.xcworkspace -scheme Tailor-iOS -sdk iphonesimulator | xcpretty -- xcodebuild test -workspace Tailor.xcworkspace -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty -- xcodebuild clean build -workspace Tailor.xcworkspace -scheme Tailor-Mac -sdk macosx | xcpretty -- xcodebuild test -workspace Tailor.xcworkspace -scheme Tailor-Mac -sdk macosx | xcpretty + - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator | xcpretty + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' | xcpretty + - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty + - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build | xcpretty + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-tvOS -sdk macosx | xcpretty notifications: email: false From 1f160daf1a3bd21caa5157af0666091c51d304fc Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 03:42:04 +0200 Subject: [PATCH 3/9] Update travis.yml --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e4665c..446753b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,12 @@ before_install: - travis_wait 35; bin/bootstrap-if-needed script: - - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator | xcpretty - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' | xcpretty - - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty - - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build | xcpretty - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-tvOS -sdk macosx | xcpretty + - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' + - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosxy + - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build + - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' -enableCodeCoverage YES test notifications: email: false From 2b2a42f11199d683499b85b8e31d589ed554b3a7 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 03:42:18 +0200 Subject: [PATCH 4/9] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 446753b..d01d495 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ script: - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosxy + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' -enableCodeCoverage YES test From 5c6d2f1cdac9148195b3e6069b4568c4b9baee18 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 10:17:25 +0200 Subject: [PATCH 5/9] Pipe through xcpretty --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d01d495..06d078d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,12 @@ before_install: - travis_wait 35; bin/bootstrap-if-needed script: - - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' - - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx - - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build - - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' -enableCodeCoverage YES test + - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator | xcpretty + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' | xcpretty + - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty + - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build | xcpretty + - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' -enableCodeCoverage YES test | xcpretty notifications: email: false From 4743bb736209d41b2f0d90510cf9f9e5af625ea2 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 10:27:55 +0200 Subject: [PATCH 6/9] Tinker with travis configuration --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 06d078d..e8861ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ before_install: - travis_wait 35; bin/bootstrap-if-needed script: + - xcodebuild clean - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator | xcpretty - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' | xcpretty - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty From e3fe38cfb24bb9a60e2073b0592f26f925a6ef4a Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 10:29:07 +0200 Subject: [PATCH 7/9] Change iOS version in travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e8861ef..f06723d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: script: - xcodebuild clean - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator | xcpretty - - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3' | xcpretty + - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.2' | xcpretty - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build | xcpretty From 07b21afe1473895bd69ee6276788c711c7cc6c10 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 10:35:59 +0200 Subject: [PATCH 8/9] Remove Podfile --- .gitignore | 1 - Podfile | 38 -------------------------------------- 2 files changed, 39 deletions(-) delete mode 100644 Podfile diff --git a/.gitignore b/.gitignore index 722215a..dd09206 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,3 @@ Carthage # SPM .build/ -Podfile.lock diff --git a/Podfile b/Podfile deleted file mode 100644 index d0c2277..0000000 --- a/Podfile +++ /dev/null @@ -1,38 +0,0 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' -use_frameworks! - -def testing_pods - pod 'Quick' - pod 'Nimble' -end - -target 'Tailor-iOS' do - # Pods for Tailor-iOS - ## None - target 'Tailor-iOS-Tests' do - inherit! :search_paths - testing_pods - end - -end - -target 'Tailor-Mac' do - # Pods for Tailor-Mac - ## None - target 'Tailor-Mac-Tests' do - inherit! :search_paths - testing_pods - end - -end - -target 'Tailor-tvOS' do - # Pods for Tailor-tvOS - ## None - target 'Tailor-tvOSTests' do - inherit! :search_paths - testing_pods - end - -end From 20f254e2c6b857de6ff21f7f6415e4249ef0f846 Mon Sep 17 00:00:00 2001 From: Christoffer Winterkvist Date: Thu, 11 May 2017 11:06:33 +0200 Subject: [PATCH 9/9] Remove tvOS --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f06723d..e3d27c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ script: - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.2' | xcpretty - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty - - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' clean build | xcpretty - - xcodebuild -project Tailor.xcodeproj -scheme "Tailor-tvOS" -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1' -enableCodeCoverage YES test | xcpretty notifications: email: false