diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2016-05-25 16:43:51 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2016-05-25 16:43:51 -0400 |
| commit | 9cbbe05f226e41b19a265be9b1a74364bdf6de80 (patch) | |
| tree | acd1a7346ad24d2b53ad98113ea620f52703b59b | |
| parent | 21ac0903ca73f6ec7967dfa9985a5d17f04535b5 (diff) | |
| download | sdl_ios-9cbbe05f226e41b19a265be9b1a74364bdf6de80.tar.gz | |
Fix a few pathshotfix/issue_403
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | SmartDeviceLink-iOS.podspec | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 035c47175..78343bb17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,13 @@ notifications: 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" + - brew outdated carthage || brew upgrade carthage 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 + - 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 diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 7711ae8e8..b7ded1227 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -8,7 +8,7 @@ s.license = { :type => "New BSD", :file => "LICENSE" } s.author = { "SmartDeviceLink Team" => "joel@livio.io" } s.platform = :ios, "6.0" s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s } -s.source_files = "SmartDeviceLink-iOS/SmartDeviceLink/*.{h,m}" +s.source_files = "SmartDeviceLink/*.{h,m}" s.requires_arc = true end |