From 1c1ce660b5ce2e2fdeda945e5b80558687dddddb Mon Sep 17 00:00:00 2001
From: Joel Fischer <joeljfischer@gmail.com>
Date: Wed, 27 Jan 2016 15:57:01 -0500
Subject: Revert "Move travis.yml to fix carthage call"

This reverts commit 767a7538cd572fe54c9f8d8a46049bd4f30269fc.
---
 .travis.yml                     | 23 +++++++++++++++++++++++
 SmartDeviceLink-iOS/.travis.yml | 22 ----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 SmartDeviceLink-iOS/.travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..035c47175
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+language: objective-c
+osx_image: xcode7.1
+
+notifications:
+  email: false
+
+before_install:
+  - brew update
+  - brew outdated xctool || brew upgrade xctool
+  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
+  - sudo installer -pkg "Carthage.pkg" -target /
+  - rm "Carthage.pkg"
+
+before_script:
+  - cd SmartDeviceLink-iOS
+  - carthage bootstrap --platform ios
+  - cd ../
+
+script:
+  - xctool -project SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj -scheme SmartDeviceLink -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test
+
+after_script:
+  - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/SmartDeviceLink-iOS/.travis.yml b/SmartDeviceLink-iOS/.travis.yml
deleted file mode 100644
index 5a1b016b9..000000000
--- a/SmartDeviceLink-iOS/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: objective-c
-osx_image: xcode7.1
-
-notifications:
-  email: false
-
-before_install:
-  - brew update
-  - brew outdated xctool || brew upgrade xctool
-  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
-  - sudo installer -pkg "Carthage.pkg" -target /
-  - rm "Carthage.pkg"
-
-before_script:
-  - cd SmartDeviceLink-iOS
-  - carthage bootstrap --platform ios
-
-script:
-  - xctool -project SmartDeviceLink-iOS.xcodeproj -scheme SmartDeviceLink -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test
-
-after_script:
-  - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
-- 
cgit v1.2.1