X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=build.gradle;h=21bbe741e09e7a1be39024a534223a9b93b0a67c;hp=72cb5282f5fcf6133ec56bfd3bb88cc6fb0e47f8;hb=HEAD;hpb=998ef327aa538f3877d0736c108847cdcb242cb3

diff --git a/build.gradle b/build.gradle
index 72cb528..21bbe74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
@@ -11,20 +12,23 @@ apply plugin: 'com.android.application'
 
 repositories {
     jcenter()
+    google()
 }
 configurations {
     smallicu
 }
 dependencies {
-    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
+    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:57.1'
-    compile files("$buildDir/icu4j-57.1.small.jar") {
+    implementation files("$buildDir/icu4j-57.1.small.jar") {
         builtBy 'makesmallicu'
     }
+    implementation 'com.android.support:preference-v7:25.3.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 }
 
 task makesmallicu (type:Exec, dependsOn: configurations.smallicu) {
@@ -39,9 +43,14 @@ task makesmallicu (type:Exec, dependsOn: configurations.smallicu) {
 
 def utildir = hasProperty("quickdicUtilDir") ? quickdicUtilDir : "Util"
 
+allprojects {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+    }
+}
+
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 29
     lintOptions {
         disable "MissingTranslation"
     }
@@ -62,9 +71,6 @@ android {
             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
@@ -76,7 +82,14 @@ android {
     }
     defaultConfig {
         applicationId 'de.reimardoeffinger.quickdic'
-        targetSdkVersion 23
-        resConfigs "de", "es", "fr", "it", "ja", "pt", "pt-rBR"
+        multiDexEnabled true
+        targetSdkVersion 29
+        resConfigs "de", "es", "eu", "fr", "it", "ja", "pt", "pt-rBR", "ru", "zh-rCN"
+        minSdkVersion 10
+    }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }