From b5e606455ec1de879ddff3a20db04cbcfda21937 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Wed, 16 Feb 2022 18:33:07 +0100
Subject: [PATCH] Updated Gradle to fix R8 bug with Kotlin 1.6
---
gradle/libs.versions.toml | 2 +-
ultrasonic/build.gradle | 23 +++++++++++------------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3fe75ef6..c57409e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
gradle = "7.3.2"
navigation = "2.3.5"
-gradlePlugin = "7.0.4"
+gradlePlugin = "7.1.1"
androidxcore = "1.6.0"
ktlint = "0.43.2"
ktlintGradle = "10.2.0"
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index fe5263ea..7f56e615 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -14,8 +14,8 @@ android {
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
+ resConfigs 'cs', 'de', 'en', 'es', 'fr', 'hu', 'it', 'nl', 'pl', 'pt', 'pt-rBR', 'ru', 'zh-rCN', 'zh-rTW'
- resConfigs "cs", "de", "en", "es", "fr", "hu", "it", "nl", "pl", "pt", "pt-rBR", "ru", "zh-rCN", "zh-rTW"
}
buildTypes {
@@ -40,20 +40,12 @@ android {
main.java.srcDirs += "${projectDir}/src/main/kotlin"
test.java.srcDirs += "${projectDir}/src/test/kotlin"
}
-
packagingOptions {
- exclude 'META-INF/LICENSE'
+ resources {
+ excludes += ['META-INF/LICENSE']
+ }
}
- lintOptions {
- baselineFile file("lint-baseline.xml")
- ignore 'MissingTranslation'
- ignore 'UnusedQuantity'
- warning 'ImpliedQuantity'
- disable 'IconMissingDensityFolder', "VectorPath"
- abortOnError true
- warningsAsErrors true
- }
kotlinOptions {
jvmTarget = "1.8"
@@ -74,6 +66,13 @@ android {
arg("room.schemaLocation", "$buildDir/schemas".toString())
}
}
+ lint {
+ abortOnError true
+ disable 'IconMissingDensityFolder', 'VectorPath'
+ ignore 'MissingTranslation', 'UnusedQuantity'
+ warning 'ImpliedQuantity'
+ warningsAsErrors true
+ }
}