diff options
3 files changed, 8 insertions, 5 deletions
diff --git a/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy index 5b6ee8d..003fc63 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy @@ -41,8 +41,8 @@ import org.gradle.api.logging.LogLevel import org.gradle.api.plugins.BasePlugin import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.tasks.SourceSet -import org.gradle.api.tasks.compile.Compile import com.android.SdkConstants +import org.gradle.api.tasks.compile.JavaCompile /** * Base class for all Android plugins @@ -286,7 +286,7 @@ abstract class AndroidBasePlugin { ProcessResourcesTask processResources, GenerateBuildConfigTask generateBuildConfigTask, CompileAidlTask aidlTask) { - def compileTask = project.tasks.add("compile${variant.name}", Compile) + def compileTask = project.tasks.add("compile${variant.name}", JavaCompile) compileTask.dependsOn processResources, generateBuildConfigTask, aidlTask VariantConfiguration config = variant.config @@ -320,6 +320,9 @@ abstract class AndroidBasePlugin { compileTask.conventionMapping.destinationDir = { project.file("$project.buildDir/classes/$variant.dirName") } + compileTask.conventionMapping.dependencyCacheDir = { + project.file("$project.buildDir/dependency-cache/$variant.dirName") + } compileTask.doFirst { compileTask.options.bootClasspath = getRuntimeJars(variant) } diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy index e7504e9..3b36cb0 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy @@ -21,7 +21,7 @@ import com.android.builder.ProductFlavor import com.android.builder.VariantConfiguration import org.gradle.api.Task import org.gradle.api.file.FileCollection -import org.gradle.api.tasks.compile.Compile +import org.gradle.api.tasks.compile.JavaCompile /** * Represents something that can be packaged into an APK and installed. @@ -32,7 +32,7 @@ public abstract class ApplicationVariant { FileCollection runtimeClasspath FileCollection packagedClasspath FileCollection resourcePackage - Compile compileTask + JavaCompile compileTask Iterable<Object> configObjects Task assembleTask Task installTask diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0cf3f16..b1a4dba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-rc-2-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip |