fix platform issue, remove pretty log

ChartsOrg · Apr 21, 2017 · c346d52 · c346d52
1 parent 66674ec
commit c346d52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
@@ -789,14 +789,13 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/FBSnapshotTestCase.framework",
-				"$(SRCROOT)/Carthage/Build/tvOS/FBSnapshotTestCase.framework",
+				"$(SRCROOT)/Carthage/Build/$(PLATFORM)/FBSnapshotTestCase.framework",
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo 'Xuan:'\necho $SCRIPT_INPUT_FILE_COUNT\n/usr/local/bin/carthage copy-frameworks";
+			shellScript = "echo 'Xuan:'\necho $SCRIPT_INPUT_FILE_COUNT\necho $SRCROOT\necho $PLATFORM\nfile $SRCROOT/Carthage/Build/$PLATFORM/FBSnapshotTestCase.framework/FBSnapshotTestCase\n/usr/local/bin/carthage copy-frameworks";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/Rakefile b/Rakefile
@@ -72,7 +72,7 @@ def xcodebuild(type, name, scheme, configuration, sdk, destination, tasks, xcpre
     abort 'Invalid project type, use `:project` for xcodeproj and `:workspace` for xcworkspace.'
   end
 
-  sh "set -o pipefail && xcodebuild #{project_type} '#{name}' -scheme '#{scheme}' -configuration '#{configuration}' -sdk #{sdk} -destination #{destination} #{tasks} | bundle exec xcpretty -c #{xcprety_args}"
+  sh "set -o pipefail && xcodebuild #{project_type} '#{name}' -scheme '#{scheme}' -configuration '#{configuration}' -sdk #{sdk} -destination #{destination} #{tasks}"
 end
 
 def run_xcodebuild(schemes_to_execute, tasks, destination, is_test, xcprety_args)