X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=build.gradle;h=21bbe741e09e7a1be39024a534223a9b93b0a67c;hp=b12758b99018e0c2859921a2584d036574d3ba1a;hb=HEAD;hpb=5a5f950636bbd9989a7770498f84d9d456249c7a diff --git a/build.gradle b/build.gradle index b12758b..21bbe74 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:4.1.1' } } @@ -11,36 +12,45 @@ apply plugin: 'com.android.application' repositories { jcenter() + google() } configurations { smallicu } dependencies { - compile 'com.android.support:appcompat-v7:23.2.1' - // 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("$buildDir/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' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' } 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" + 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-55.1.small.jar" + commandLine "./mksmallicu.sh", "${configurations.smallicu.resolve()[0]}", "$buildDir/icu4j-57.1.small.jar" } -def utildir = hasProperty("quickdicUtilDir") ? quickdicUtilDir : "../Util" +def utildir = hasProperty("quickdicUtilDir") ? quickdicUtilDir : "Util" + +allprojects { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" + } +} android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 29 lintOptions { disable "MissingTranslation" } @@ -61,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/ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // This moves them out of them default location under src//... which would @@ -75,6 +82,14 @@ android { } defaultConfig { applicationId 'de.reimardoeffinger.quickdic' - targetSdkVersion 22 + 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 } }