X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=build.gradle;h=e79d282527b4f82a21c4c0384f7fac2efff6908c;hb=b92a0338953fbbd1ecab464ba0a207abce08335e;hp=e7beaac1a642f0ed4914dffbfdd8e7fd9032b5f7;hpb=8a3734e017bc8c837b93eee77ed564dfdc4106f9;p=Dictionary.git

diff --git a/build.gradle b/build.gradle
index e7beaac..e79d282 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 
@@ -16,25 +16,35 @@ configurations {
     smallicu
 }
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:design:25.3.0'
     // Note: you can just replace "smallicu" by compile
     // and remove the "compile files" part if you do not
     // care about the size of the apk
-    smallicu 'com.ibm.icu:icu4j:55.1'
-    compile files("$buildDir/icu4j-55.1.small.jar") {
+    smallicu 'com.ibm.icu:icu4j:57.1'
+    compile files("$buildDir/icu4j-57.1.small.jar") {
         builtBy 'makesmallicu'
     }
 }
 
-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-57.1.small.jar"
+    // necessary due to gradle bug: GRADLE-2638
+    new File("$buildDir").mkdirs()
+    commandLine "./mksmallicu.sh", "${configurations.smallicu.resolve()[0]}", "$buildDir/icu4j-57.1.small.jar"
 }
 
+def utildir = hasProperty("quickdicUtilDir") ? quickdicUtilDir : "Util"
+
 android {
-    compileSdkVersion 22
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25"
+    lintOptions {
+        disable "MissingTranslation"
+    }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
@@ -47,7 +57,7 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src', '../Util/src']
+            java.srcDirs = ['src', utildir + "/src"]
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
@@ -66,6 +76,6 @@ android {
     }
     defaultConfig {
         applicationId 'de.reimardoeffinger.quickdic'
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 }