From ba7fedf2030dcdf13f7a2cf83559e4daa14f623c Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 3 Oct 2021 02:29:12 +0200 Subject: Small gradle build file cleanup --- main/build.gradle.kts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 59bc8215..cb4e28c9 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -31,8 +31,6 @@ android { testOptions.unitTests.isIncludeAndroidResources = true - - externalNativeBuild { cmake { path = File("${projectDir}/src/main/cpp/CMakeLists.txt") @@ -69,13 +67,13 @@ android { keyPassword = keystoreAliasPassword val keystoreAlias: String? by project keyAlias = keystoreAlias - isV1SigningEnabled = true - isV2SigningEnabled = true + enableV1Signing = true + enableV2Signing = true } } - lintOptions { + lint { enable("BackButton", "EasterEgg", "StopShip", "IconExpectedSize", "GradleDynamicVersion", "NewerVersionAvailable") warning("ImpliedQuantity", "MissingQuantity") disable("MissingTranslation", "UnsafeNativeCodeLocation") @@ -174,7 +172,7 @@ dependencies { // Is there a nicer way to do this? dependencies.add("uiImplementation", "androidx.constraintlayout:constraintlayout:1.1.3") - dependencies.add("uiImplementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72") + dependencies.add("uiImplementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30") dependencies.add("uiImplementation", "androidx.cardview:cardview:1.0.0") dependencies.add("uiImplementation", "androidx.recyclerview:recyclerview:1.0.0") dependencies.add("uiImplementation", "androidx.appcompat:appcompat:1.1.0") @@ -189,10 +187,8 @@ dependencies { dependencies.add("uiImplementation", "androidx.webkit:webkit:1.2.0") dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1") dependencies.add("uiImplementation", "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1") - - - - testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32") + + testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30") testImplementation("junit:junit:4.13.2") testImplementation("org.mockito:mockito-core:3.9.0") testImplementation("org.robolectric:robolectric:4.5.1") -- cgit v1.2.3