-
-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2767 from danielgindi/xcode-9
Update xcode project to support xcode 9
- Loading branch information
Showing
151 changed files
with
1,020 additions
and
950 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,31 @@ | ||
| osx_image: xcode8.3 | ||
| language: objective-c | ||
| rvm: | ||
| - 2.2 | ||
| osx_image: xcode8.3 | ||
| matrix: | ||
| include: | ||
| - osx_image: xcode8.3 | ||
| env: PLATFORM="iOS" | ||
| - osx_image: xcode8.3 | ||
| env: PLATFORM="tvOS" | ||
| - osx_image: xcode8.3 | ||
| env: PLATFORM="macOS" | ||
| - osx_image: xcode9 | ||
| env: PLATFORM="iOS" | ||
| - osx_image: xcode9 | ||
| env: PLATFORM="tvOS" | ||
| - osx_image: xcode9 | ||
| env: PLATFORM="macOS" | ||
| env: | ||
| global: | ||
| - LANG=en_US.UTF-8 | ||
| - secure: HRl5Cg3/LmTJYCSDGtV8Fiqf6OgWXR6C5YkNviOElU9YmcCTvnmE7MCm+gK8hJNIQ2mWCBTlxTC7jJxeYlx0D+JQ6IhRc75B4zXgbtth6HCzlvhWDcBbNU/K+JPDjy2EAoVgvf8Xseq6GqM4WcVg2Pwr9PS3aaH/SKDE6yVoPXRM2wXRAxIdxayqm/RQgG88jAKgg+Ub5DKW/c9NLLbUf/WdY9SgQDJtqeZCMv7G3/IzW34KZgVPsqSrPByzZXbf7KgYkYLQlscH4mcUctk1qxhdCae//zcgUZo/utpXWbPXQqtvDpuqrg9IRvoGxa/D1I7dLSJsVnk4aP7RW18vn4HJ82C2AiEp+lU2TQE9y5lXcGssZVIa5aZNTWL90HVer3Kg6AnHffvdCSZ/UHsMZJFURUXL9fRIlWVGuEDeQOqlV6lUmEtp/BiEdV4D5PuCyT6snsmEwkc51goyqh6uS6XhJyqYEQdxdoybznwp91tVmASsRybppIGHTkcWN5csF4zQt40tEwd8LoqM+bBUo0wxKiKsNsecL4JA+YDYs2saZY9U3s8jAaIon+qDu071fPRaPEvBhYHYDhy4cTvBXibyGUYGHkrgLu0w19wDfHcJKt2In58yOmaCCLNoTGp/ZLNVRyZ8VDlj/NdJ2dWpMsL2Aj7OxU065kCL2FlvuRU= | ||
| matrix: | ||
| - PLATFORM="iOS" | ||
| - PLATFORM="tvOS" | ||
| - PLATFORM="macOS" | ||
| - LANG=en_US.UTF-8 | ||
| - secure: HRl5Cg3/LmTJYCSDGtV8Fiqf6OgWXR6C5YkNviOElU9YmcCTvnmE7MCm+gK8hJNIQ2mWCBTlxTC7jJxeYlx0D+JQ6IhRc75B4zXgbtth6HCzlvhWDcBbNU/K+JPDjy2EAoVgvf8Xseq6GqM4WcVg2Pwr9PS3aaH/SKDE6yVoPXRM2wXRAxIdxayqm/RQgG88jAKgg+Ub5DKW/c9NLLbUf/WdY9SgQDJtqeZCMv7G3/IzW34KZgVPsqSrPByzZXbf7KgYkYLQlscH4mcUctk1qxhdCae//zcgUZo/utpXWbPXQqtvDpuqrg9IRvoGxa/D1I7dLSJsVnk4aP7RW18vn4HJ82C2AiEp+lU2TQE9y5lXcGssZVIa5aZNTWL90HVer3Kg6AnHffvdCSZ/UHsMZJFURUXL9fRIlWVGuEDeQOqlV6lUmEtp/BiEdV4D5PuCyT6snsmEwkc51goyqh6uS6XhJyqYEQdxdoybznwp91tVmASsRybppIGHTkcWN5csF4zQt40tEwd8LoqM+bBUo0wxKiKsNsecL4JA+YDYs2saZY9U3s8jAaIon+qDu071fPRaPEvBhYHYDhy4cTvBXibyGUYGHkrgLu0w19wDfHcJKt2In58yOmaCCLNoTGp/ZLNVRyZ8VDlj/NdJ2dWpMsL2Aj7OxU065kCL2FlvuRU= | ||
| cache: | ||
| - bundler | ||
| - bundler | ||
| before_install: | ||
| - brew update | ||
| - brew upgrade carthage || true | ||
| - carthage version | ||
| - carthage bootstrap --platform $PLATFORM | ||
| - brew update | ||
| - brew upgrade carthage || true | ||
| - carthage version | ||
| - carthage bootstrap --platform $PLATFORM | ||
| script: | ||
| - bundle exec rake ci[$PLATFORM] | ||
| - bundle exec rake ci[$PLATFORM] | ||
| after_success: | ||
| - bash <(curl -s https://codecov.io/bash) | ||
| - bash <(curl -s https://codecov.io/bash) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| github "facebook/ios-snapshot-test-case" "c1808fb4435ffc3db2203e7623935f39fc31aa8f" | ||
| github "facebook/ios-snapshot-test-case" "ed4e6a6e81bfb69a5223156e6c3d389a416cf6e3" |
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 26 additions & 44 deletions
70
Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| language = swift("3.0") | ||
| platforms = [ | ||
| macos("10.11"), | ||
| ios("8.0"), | ||
| tvos("9.0") | ||
| ] | ||
|
|
||
| test_platforms = [ | ||
| ios("8.0"), | ||
| tvos("9.0") | ||
| ] | ||
|
|
||
| environment_variables = { | ||
| "FB_REFERENCE_IMAGE_DIR": "$(SOURCE_ROOT)/Tests/ReferenceImages" | ||
| } | ||
|
|
||
| build_dependencies = new_script do |script| | ||
| script.name = "Build Dependencies" | ||
| script.script = "exec \"${SRCROOT}/scripts/build-dependencies.sh\"" | ||
| end | ||
|
|
||
| charts_tests = new_target do |target| | ||
| target.name = "ChartsTests" | ||
| target.platforms = test_platforms | ||
| target.language = language | ||
| target.info_plist = "Tests/Supporting Files/Info.plist" | ||
| target.bundle_id = "com.dcg.ChartsTests" | ||
| target.include_files = ["Tests/**/*.swift"] | ||
| target.exclude_files = [] | ||
| target.resource_files = ["Tests/**/*.xcassets"] | ||
| target.dependencies = [ | ||
| "Charts", | ||
| "FBSnapshotTestCase" | ||
| ] | ||
| target.type = :unit_test_bundle | ||
| target.enable_code_coverage = true | ||
| target.pre_build_scripts = [ | ||
| build_dependencies | ||
| ] | ||
| target.environment_variables = environment_variables | ||
| end | ||
|
|
||
| charts = new_target do |target| | ||
| target.name = "Charts" | ||
| target.platforms = platforms | ||
| target.language = language | ||
| target.info_plist = "Source/Supporting Files/Info.plist" | ||
| target.bundle_id = "com.dcg.Charts" | ||
| target.header = "Source/Supporting Files/Charts.h" | ||
| target.include_files = ["Source/Charts/**/*.swift"] | ||
| target.exclude_files = [] | ||
| target.is_safe_for_extensions = true | ||
| target.test_target = charts_tests | ||
| target.environment_variables = environment_variables | ||
| end | ||
|
|
||
| project.name = "Charts" | ||
| project.scripts_directory = "scripts" | ||
| project.targets = [ | ||
| charts, | ||
| charts_tests | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.