X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=build.gradle;h=aafb2b8562856628d258ed2c6b999c80a33297ce;hp=5d1a114f4a56f55f11fc37bb19b1e3a3dbae0b13;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=1a6c9deddceba96e4e87992e056ae75fb9d64081

diff --git a/build.gradle b/build.gradle
index 5d1a114..aafb2b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
     }
 }
 
@@ -11,49 +12,64 @@ apply plugin: 'com.android.application'
 
 repositories {
     jcenter()
+    google()
 }
 configurations {
     smallicu
 }
 dependencies {
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    // Note: you can just replace "smallicu" by compile
+    implementation 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:design:25.3.1'
+    // Note: you can just replace "smallicu" by implementation
     // 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('build/icu4j-55.1.small.jar') {
+    smallicu 'com.ibm.icu:icu4j:57.1'
+    implementation files("$buildDir/icu4j-57.1.small.jar") {
         builtBy 'makesmallicu'
     }
+    implementation 'com.android.support:preference-v7:25.3.1'
 }
 
-task makesmallicu (dependsOn: configurations.smallicu) << {
-    exec {
-        commandLine "./mksmallicu.sh", "${configurations.smallicu.resolve()[0]}", "build/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"
+
+allprojects {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
     }
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 29
+    lintOptions {
+        disable "MissingTranslation"
+    }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
         }
         release {
             minifyEnabled true
+            shrinkResources true
         }
     }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src', '../Util/src']
+            java.srcDirs = ['src', utildir + "/src"]
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
 
-        // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
-
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
         // This moves them out of them default location under src/<type>/... which would
@@ -65,6 +81,8 @@ android {
     }
     defaultConfig {
         applicationId 'de.reimardoeffinger.quickdic'
-        targetSdkVersion 22
+        targetSdkVersion 29
+        resConfigs "de", "es", "eu", "fr", "it", "ja", "pt", "pt-rBR", "ru", "zh-rCN"
+        minSdkVersion 10
     }
 }