diff --git a/build.gradle b/build.gradle
index d4ae11484788b850b962464d2121f144dc39d168..18f863f05c174caa9d4c6b24b92ff22ee2ffcf75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/decoder/build.gradle b/decoder/build.gradle
index 3a7b8ad69e4d71a10bc84243da3e01ef6422debc..318f8447fb22b0aea6e7448a469ba3924393816b 100644
--- a/decoder/build.gradle
+++ b/decoder/build.gradle
@@ -30,13 +30,20 @@ android {
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:_"
 
+    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"
     }
+}
 
+dependencies {
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:_"
     implementation "org.bouncycastle:bcpkix-jdk18on:_"