diff --git a/baksmali/build.gradle b/baksmali/build.gradle
index 1644c09d..d2f74aec 100644
--- a/baksmali/build.gradle
+++ b/baksmali/build.gradle
@@ -75,7 +75,7 @@ task fatJar(type: Jar) {
 
     doLast {
         if (!System.getProperty('os.name').toLowerCase().contains('windows')) {
-            ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archivePath, overwrite: true)
+            ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archiveFile.get().asFile, overwrite: true)
         }
     }
 }
diff --git a/dexlib2/build.gradle b/dexlib2/build.gradle
index d4eb3ad1..9fa1aac2 100644
--- a/dexlib2/build.gradle
+++ b/dexlib2/build.gradle
@@ -120,7 +120,7 @@ task generateAccessorTestSource(type: JavaExec) {
     outputs.dir file(testAccessorOutputDir)
 
     classpath = configurations.accessorTestGenerator
-    main = 'com.android.tools.smali.dexlib2.AccessorTestGenerator'
+    mainClass = 'com.android.tools.smali.dexlib2.AccessorTestGenerator'
     args testAccessorOutputFile
 }
 compileAccessorTestJava.dependsOn(generateAccessorTestSource)
@@ -133,7 +133,7 @@ task generateAccessorTestDex(type: JavaExec, dependsOn: compileAccessorTestJava)
     inputs.dir(project.sourceSets.accessorTest.output.classesDirs)
     outputs.file outputDex
 
-    main 'com.android.dx.command.Main'
+    mainClass = 'com.android.dx.command.Main'
     classpath = configurations.dx
 
     args '--dex'
diff --git a/smali/build.gradle b/smali/build.gradle
index fbb6394e..cc59da08 100644
--- a/smali/build.gradle
+++ b/smali/build.gradle
@@ -70,7 +70,7 @@ idea {
         if (buildDir.exists()) {
             excludeDirs.addAll(buildDir.listFiles())
         }
-        for (sourceDir in (sourceDirs + testSourceDirs)) {
+        for (sourceDir in (sourceDirs + sourceSets.test.allSource.srcDirs)) {
             excludeDirs.remove(sourceDir);
             while ((sourceDir = sourceDir.getParentFile()) != null) {
                 excludeDirs.remove(sourceDir);
@@ -112,7 +112,7 @@ task fatJar(type: Jar, dependsOn: jar) {
 
     doLast {
         if (!System.getProperty('os.name').toLowerCase().contains('windows')) {
-            ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archivePath, overwrite: true)
+            ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archiveFile.get().asFile, overwrite: true)
         }
     }
 }
@@ -174,5 +174,6 @@ sourcesJar {
 }
 sourcesJar.dependsOn('generateGrammarSource')
 sourcesJar.dependsOn('jflex')
+compileJava.dependsOn('generateGrammarSource')
 
 tasks.getByPath(':release').dependsOn(proguard)