added support for gradle.properties to specify util library location

[Dictionary.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index e7beaac1a642f0ed4914dffbfdd8e7fd9032b5f7..55febf87b8aec2eff6435be7708e1d69845d0ced 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -26,12 +26,18 @@ dependencies {
     }
 }
 
-task makesmallicu (dependsOn: configurations.smallicu) << {
-    exec {
-        commandLine "./mksmallicu.sh", "${configurations.smallicu.resolve()[0]}", "$buildDir/icu4j-55.1.small.jar"
-    }
+task makesmallicu (type:Exec, dependsOn: configurations.smallicu) {
+    inputs.file "mksmallicu.sh"
+    inputs.file "${configurations.smallicu.resolve()[0]}"
+    outputs.dir "$buildDir"
+    outputs.file "$buildDir/icu4j-55.1.small.jar"
+    // necessary due to gradle bug: GRADLE-2638
+    new File("$buildDir").mkdirs()
+    commandLine "./mksmallicu.sh", "${configurations.smallicu.resolve()[0]}", "$buildDir/icu4j-55.1.small.jar"
 }
 
+def utildir = hasProperty("quickdicUtilDir") ? quickdicUtilDir : "../Util"
+
 android {
     compileSdkVersion 22
     buildToolsVersion "23.0.1"
@@ -47,7 +53,7 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src', '../Util/src']
+            java.srcDirs = ['src', utildir + "/src"]
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }