use name instead of uuid, add run script for copying missing framewor…

…k for ChartsTests
ChartsOrg · Apr 21, 2017 · f4d6b64 · f4d6b64
1 parent faefe1c
commit f4d6b64
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ before_install:
 - brew update
 - brew upgrade carthage || true
 - carthage version
-- travis_wait carthage bootstrap --platform $PLATFORM
+- carthage bootstrap --platform $PLATFORM
 script:
 - bundle exec rake ci[$PLATFORM]
 after_success:

diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
@@ -703,6 +703,7 @@
 				06165F2A1D8110E600722320 /* Sources */,
 				06165F2B1D8110E600722320 /* Frameworks */,
 				06165F2C1D8110E600722320 /* Resources */,
+				B6355D621EA9B71800B74B2E /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -782,6 +783,20 @@
 			shellPath = /bin/sh;
 			shellScript = "exec \"${SRCROOT}/scripts/build-dependencies.sh\"\n";
 		};
+		B6355D621EA9B71800B74B2E /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/$(PLATFORM)/FBSnapshotTestCase.framework",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "carthage copy-frameworks";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/Rakefile b/Rakefile
@@ -39,8 +39,8 @@ def devices
   {
     iOS: {
       sdk: 'iphonesimulator',
-      device: "id='57E7D476-3A98-4107-A64D-98CA0EA13EC0'",
-      uuid: '57E7D476-3A98-4107-A64D-98CA0EA13EC0'
+      device: "name='iPhone 7'",
+      name: 'iPhone 7'
     },
     macOS: {
       sdk: 'macosx',
@@ -49,8 +49,8 @@ def devices
     },
     tvOS: {
       sdk: 'appletvsimulator',
-      device: "id='DA272ADF-D0A3-4F0A-8F81-32D1CB993197'",
-      uuid: 'DA272ADF-D0A3-4F0A-8F81-32D1CB993197'
+      device: "name='Apple TV 1080p'",
+      name: 'Apple TV 1080p'
     }
   }
 end