Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shift files from SmartDeviceLink-iOS subdirectory to root #404

Merged
merged 3 commits into from May 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions .gitignore
Expand Up @@ -37,9 +37,8 @@ profile
# Carthage #
############
Carthage.pkg
SmartDeviceLink-iOS/Carthage/Build
SmartDeviceLink-iOS/Carthage/Checkouts
SmartDeviceLink-iOS/infer-out
Carthage/Checkouts
infer-out
# This ignore here is prevent projects fetching sdl_ios as a submodule using
# Carthage from resulting as `-dirty` in the `git status`.
Carthage/Build
8 changes: 2 additions & 6 deletions .travis.yml
Expand Up @@ -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)
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion SmartDeviceLink-iOS.podspec
Expand Up @@ -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
Expand Up @@ -1106,11 +1106,14 @@
5D1464331C99AC0900727339 /* OCMock.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = OCMock.framework.dSYM; path = Carthage/Build/iOS/OCMock.framework.dSYM; sourceTree = "<group>"; };
5D1464341C99AC0900727339 /* Quick.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Quick.framework.dSYM; path = Carthage/Build/iOS/Quick.framework.dSYM; sourceTree = "<group>"; };
5D1464351C99AC0900727339 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Carthage/Build/iOS/OCMock.framework; sourceTree = "<group>"; };
5D3759BC1CE12E810088C60E /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../../CHANGELOG.md; sourceTree = "<group>"; };
5D3759BD1CE12E810088C60E /* DEPENDENCIES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = DEPENDENCIES.md; path = ../../DEPENDENCIES.md; sourceTree = "<group>"; };
5D3759BE1CE12E810088C60E /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE; path = ../../LICENSE; sourceTree = "<group>"; };
5D3759BF1CE12E810088C60E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = "<group>"; };
5D3759C01CE12E810088C60E /* SmartDeviceLink-iOS.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = "SmartDeviceLink-iOS.podspec"; path = "../../SmartDeviceLink-iOS.podspec"; sourceTree = "<group>"; };
5D1665A01CF5D5DA00CC4CA1 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = SOURCE_ROOT; };
5D1665A11CF5D5DA00CC4CA1 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
5D1665A21CF5D5DA00CC4CA1 /* Cartfile.private */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.private; sourceTree = SOURCE_ROOT; };
5D1665A31CF5D5DA00CC4CA1 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = SOURCE_ROOT; };
5D1665A41CF5D5DA00CC4CA1 /* DEPENDENCIES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEPENDENCIES.md; sourceTree = SOURCE_ROOT; };
5D1665A51CF5D5DA00CC4CA1 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
5D1665A61CF5D5DA00CC4CA1 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
5D1665A71CF5D5DA00CC4CA1 /* SmartDeviceLink-iOS.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SmartDeviceLink-iOS.podspec"; sourceTree = SOURCE_ROOT; };
5D4019AF1A76EC350006B0C2 /* SmartDeviceLink-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SmartDeviceLink-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5D4029D31A76F0340006B0C2 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SmartDeviceLink_Example/Images.xcassets; sourceTree = SOURCE_ROOT; };
5D4029D51A76F0410006B0C2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SmartDeviceLink_Example/Info.plist; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -2860,11 +2863,14 @@
5D5934EE1A85160900687FB9 /* Protocol */,
5D5934ED1A85160400687FB9 /* Proxy */,
5D61FA201A84237100846EE7 /* SmartDeviceLink.h */,
5D3759BC1CE12E810088C60E /* CHANGELOG.md */,
5D3759BD1CE12E810088C60E /* DEPENDENCIES.md */,
5D3759BE1CE12E810088C60E /* LICENSE */,
5D3759BF1CE12E810088C60E /* README.md */,
5D3759C01CE12E810088C60E /* SmartDeviceLink-iOS.podspec */,
5D1665A01CF5D5DA00CC4CA1 /* .gitignore */,
5D1665A11CF5D5DA00CC4CA1 /* .travis.yml */,
5D1665A21CF5D5DA00CC4CA1 /* Cartfile.private */,
5D1665A31CF5D5DA00CC4CA1 /* CHANGELOG.md */,
5D1665A41CF5D5DA00CC4CA1 /* DEPENDENCIES.md */,
5D1665A51CF5D5DA00CC4CA1 /* LICENSE */,
5D1665A61CF5D5DA00CC4CA1 /* README.md */,
5D1665A71CF5D5DA00CC4CA1 /* SmartDeviceLink-iOS.podspec */,
5D61FA1E1A84237100846EE7 /* Supporting Files */,
);
path = SmartDeviceLink;
Expand Down
File renamed without changes.
File renamed without changes.