From f806f1a0941b11276cbecbf6339a1922e305a3dd Mon Sep 17 00:00:00 2001
From: "stopcovid@lunabee.com" <StopCovid Batman>
Date: Fri, 9 Dec 2022 11:34:03 +0100
Subject: [PATCH] fix merge
---
decoder/build.gradle | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/decoder/build.gradle b/decoder/build.gradle
index 4538b03..63a2101 100644
--- a/decoder/build.gradle
+++ b/decoder/build.gradle
@@ -30,17 +30,11 @@ android {
dependencies {
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:_"
- android.libraryVariants.all { variant ->
- variant.outputs.each { output ->
- def lintTask = tasks["lint${variant.name.capitalize()}"]
- output.assemble.dependsOn lintTask
- }
- implementation "org.jetbrains.kotlin:kotlin-stdlib:_"
- implementation "org.jetbrains.kotlin:kotlin-reflect:_"
- implementation "com.augustcellars.cose:cose-java:_"
- implementation("com.github.java-json-tools:json-schema-validator:_") {
- exclude group: "org.mozilla", module: "rhino"
- }
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:_"
+ implementation "org.jetbrains.kotlin:kotlin-reflect:_"
+ implementation "com.augustcellars.cose:cose-java:_"
+ implementation("com.github.java-json-tools:json-schema-validator:_") {
+ exclude group: "org.mozilla", module: "rhino"
}
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:_"
--
GitLab