Return-Path: X-Original-To: apmail-crunch-commits-archive@www.apache.org Delivered-To: apmail-crunch-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8821218599 for ; Thu, 25 Jun 2015 08:10:47 +0000 (UTC) Received: (qmail 39280 invoked by uid 500); 25 Jun 2015 08:10:47 -0000 Delivered-To: apmail-crunch-commits-archive@crunch.apache.org Received: (qmail 39205 invoked by uid 500); 25 Jun 2015 08:10:47 -0000 Mailing-List: contact commits-help@crunch.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@crunch.apache.org Delivered-To: mailing list commits@crunch.apache.org Received: (qmail 39195 invoked by uid 99); 25 Jun 2015 08:10:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 08:10:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35C81DFC77; Thu, 25 Jun 2015 08:10:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jwills@apache.org To: commits@crunch.apache.org Date: Thu, 25 Jun 2015 08:10:48 -0000 Message-Id: <3c6363ee15254f4b8ebb7ff82f93c462@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] crunch git commit: CRUNCH-529: Prep changes for cross-compiling support for Scala 2.11. CRUNCH-529: Prep changes for cross-compiling support for Scala 2.11. Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/d176778c Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/d176778c Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/d176778c Branch: refs/heads/master Commit: d176778cf803374506cb7743069a05e28e07e2cf Parents: d4da529 Author: Josh Wills Authored: Fri May 29 21:11:47 2015 -0400 Committer: Josh Wills Committed: Thu Jun 25 09:10:06 2015 +0100 ---------------------------------------------------------------------- .../crunch/scrunch/interpreter/InterpreterRunner.scala | 5 ++--- pom.xml | 13 +++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/d176778c/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala b/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala index 9443f68..0d84381 100644 --- a/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala +++ b/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala @@ -31,7 +31,6 @@ import scala.tools.nsc.ScriptRunner import scala.tools.nsc.interpreter.ILoop import scala.tools.nsc.io.Jar import scala.tools.nsc.io.VirtualDirectory - import com.google.common.io.Files import org.apache.hadoop.conf.Configuration @@ -127,7 +126,7 @@ object InterpreterRunner extends MainGenericRunner { ScriptRunner.runCommand(settings, combinedCode, thingToRun +: command.arguments) } else runTarget() match { - case Left(ex) => errorFn(ex) + case Left(ex) => errorFn(ex.toString()) case Right(b) => b } } @@ -146,7 +145,7 @@ object InterpreterRunner extends MainGenericRunner { def createReplCodeJar(): File = { var jarStream: JarOutputStream = null try { - val virtualDirectory = repl.virtualDirectory + val virtualDirectory = repl.intp.virtualDirectory.asInstanceOf[VirtualDirectory] val tempDir = Files.createTempDir() val tempJar = new File(tempDir, "replJar.jar") jarStream = new JarOutputStream(new FileOutputStream(tempJar)) http://git-wip-us.apache.org/repos/asf/crunch/blob/d176778c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 38e9955..3c43f42 100644 --- a/pom.xml +++ b/pom.xml @@ -59,8 +59,8 @@ under the License. UTF-8 UTF-8 - 1.6 - 1.6 + 1.7 + 1.7