Merge 9f537f0 into b6ea298

spotify · Feb 2, 2016 · 2852484 · 2852484
2 parents b6ea298 + 9f537f0
commit 2852484
Show file tree

Hide file tree

Showing 7 changed files with 572 additions and 260 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,19 +45,21 @@ env:
     - BUILD="build"
     - BUILD_TEST="build test"
     - ENABLE_CODE_COVERAGE="-enableCodeCoverage YES"
+    - PROJECT_LIBRARY="SPTDataLoader.xcodeproj"
+    - PROJECT_DEMO="SPTDataLoaderDemo.xcodeproj"
   matrix:
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6"   SCHEME="$SCHEME_IOS_LIBRARY"            BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.2,name=iPhone 4s"  SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.3,name=iPhone 5"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.4,name=iPhone 5s"  SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.0,name=iPhone 6"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.0,name=iPhone 6"   SCHEME="$SCHEME_IOS_LIBRARY"            BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.1,name=iPhone 5"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.2,name=iPhone 6s"  SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=macosx           TEST_DEST="platform=OS X,arch=x86_64"                     SCHEME="$SCHEME_OSX_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=watchsimulator   TEST_DEST="OS=2.1,name=Apple Watch - 38mm"                SCHEME="$SCHEME_WATCH_FRAMEWORK"        BUILD_ACTIONS="$BUILD"      EXTRA_ARGUMENTS=""
-    - TEST_SDK=watchsimulator   TEST_DEST="OS=2.0,name=Apple Watch - 38mm"                SCHEME="$SCHEME_WATCH_FRAMEWORK"        BUILD_ACTIONS="$BUILD"      EXTRA_ARGUMENTS=""
-    - TEST_SDK=appletvsimulator TEST_DEST="OS=9.1,name=Apple TV 1080p"                    SCHEME="$SCHEME_TV_FRAMEWORK"           BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=appletvsimulator TEST_DEST="OS=9.0,name=Apple TV 1080p"                    SCHEME="$SCHEME_TV_FRAMEWORK"           BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE"
-    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6"   SCHEME="$SCHEME_DEMO"                   BUILD_ACTIONS="$BUILD"      EXTRA_ARGUMENTS=""
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6"   SCHEME="$SCHEME_IOS_LIBRARY"            BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.2,name=iPhone 4s"  SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.3,name=iPhone 5"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.4,name=iPhone 5s"  SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.0,name=iPhone 6"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.0,name=iPhone 6"   SCHEME="$SCHEME_IOS_LIBRARY"            BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.1,name=iPhone 5"   SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=9.2,name=iPhone 6s"  SCHEME="$SCHEME_IOS_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=macosx           TEST_DEST="platform=OS X,arch=x86_64"                     SCHEME="$SCHEME_OSX_FRAMEWORK"          BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=watchsimulator   TEST_DEST="OS=2.1,name=Apple Watch - 38mm"                SCHEME="$SCHEME_WATCH_FRAMEWORK"        BUILD_ACTIONS="$BUILD"      EXTRA_ARGUMENTS=""                      PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=watchsimulator   TEST_DEST="OS=2.0,name=Apple Watch - 38mm"                SCHEME="$SCHEME_WATCH_FRAMEWORK"        BUILD_ACTIONS="$BUILD"      EXTRA_ARGUMENTS=""                      PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=appletvsimulator TEST_DEST="OS=9.1,name=Apple TV 1080p"                    SCHEME="$SCHEME_TV_FRAMEWORK"           BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=appletvsimulator TEST_DEST="OS=9.0,name=Apple TV 1080p"                    SCHEME="$SCHEME_TV_FRAMEWORK"           BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
+    - TEST_SDK=iphonesimulator  TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6"   SCHEME="$SCHEME_DEMO"                   BUILD_ACTIONS="$BUILD"      EXTRA_ARGUMENTS=""                      PROJECT="$PROJECT_DEMO"