From de3a5f95ae35478159786155474a95c744b2cbc4 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Mon, 24 Sep 2012 00:20:30 -0700
Subject: [PATCH] Fix how the classpath is set for JavaExec gradle tasks

---
 baksmali/build.gradle | 2 +-
 smali/build.gradle    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/baksmali/build.gradle b/baksmali/build.gradle
index 7bbd12a4..2ee41805 100644
--- a/baksmali/build.gradle
+++ b/baksmali/build.gradle
@@ -69,7 +69,7 @@ gradle.taskGraph.whenReady {
 }
 
 task proguard(type: JavaExec, dependsOn: jar) {
-    classpath = files(configurations.proguard.asPath)
+    classpath = configurations.proguard
     main = 'proguard.ProGuard'
     args '-libraryjars ' + System.properties['java.home'] + '/lib/rt.jar'
     args '-dontobfuscate'
diff --git a/smali/build.gradle b/smali/build.gradle
index 54057c5c..731ace83 100644
--- a/smali/build.gradle
+++ b/smali/build.gradle
@@ -69,7 +69,7 @@ task generateAntlrSource(type: JavaExec) {
     mkdir(antlrOutput)
     def grammars = fileTree(antlrSource).include('**/*.g')
 
-    classpath = files(configurations.antlr3.asPath)
+    classpath = configurations.antlr3
     main = 'org.antlr.Tool'
     args '-fo', relativePath(new File(antlrOutput, 'org/jf/smali'))
     args grammars.files
@@ -82,7 +82,7 @@ task generateTestAntlrSource(type: JavaExec) {
     mkdir(testAntlrOutput)
     def grammars = fileTree(testAntlrSource).include('**/*.g')
 
-    classpath = files(configurations.antlr3.asPath)
+    classpath = configurations.antlr3
     main = 'org.antlr.Tool'
     args '-fo', relativePath(new File(testAntlrOutput, 'org/jf/smali'))
     args grammars.files.join(' ')
@@ -95,7 +95,7 @@ task generateJflexSource(type: JavaExec) {
     mkdir(jflexOutput)
     def grammars = fileTree(jflexSource).include('**/*.flex')
 
-    classpath = files(configurations.jflex.asPath)
+    classpath = configurations.jflex
     main = 'JFlex.Main'
     args '-q'
     args '-d', relativePath(new File(jflexOutput, 'org/jf/smali'))
@@ -133,7 +133,7 @@ gradle.taskGraph.whenReady {
 }
 
 task proguard(type: JavaExec, dependsOn: jar) {
-    classpath = files(configurations.proguard.asPath)
+    classpath = configurations.proguard
     main = 'proguard.ProGuard'
     args '-libraryjars ' + System.properties['java.home'] + '/lib/rt.jar'
     args '-dontobfuscate'