From 38a81c202b19f5de16f1566c047183bafaa59b2f Mon Sep 17 00:00:00 2001
From: Gopal <kris87us@gmail.com>
Date: Fri, 12 Nov 2021 10:30:57 -0700
Subject: [PATCH 1/2] Convert `mockk/agent/android/dispatcher/build.gradle` to
 Kotlin DSL

---
 agent/android/dispatcher/build.gradle     | 31 -----------------------
 agent/android/dispatcher/build.gradle.kts | 29 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 31 deletions(-)
 delete mode 100644 agent/android/dispatcher/build.gradle
 create mode 100644 agent/android/dispatcher/build.gradle.kts

diff --git a/agent/android/dispatcher/build.gradle b/agent/android/dispatcher/build.gradle
deleted file mode 100644
index ffc138b45..000000000
--- a/agent/android/dispatcher/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 30
-
-    android {
-        lintOptions {
-            disable 'InvalidPackage'
-            warning 'NewApi'
-        }
-
-        packagingOptions {
-            exclude 'META-INF/main.kotlin_module'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
-        applicationId 'com.android.dexmaker.mockito.inline.dispatcher'
-        minSdkVersion 21
-        targetSdkVersion 28
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-}
diff --git a/agent/android/dispatcher/build.gradle.kts b/agent/android/dispatcher/build.gradle.kts
new file mode 100644
index 000000000..6c63386d0
--- /dev/null
+++ b/agent/android/dispatcher/build.gradle.kts
@@ -0,0 +1,29 @@
+plugins {
+    id("com.android.application")
+}
+
+android {
+    compileSdkVersion(30)
+
+    android {
+        lintOptions {
+            disable("InvalidPackage")
+            warning("NewApi")
+        }
+
+        packagingOptions {
+            exclude("META-INF/main.kotlin_module")
+        }
+    }
+
+    defaultConfig {
+        minSdkVersion(21)
+        targetSdkVersion(28)
+        applicationId = "com.android.dexmaker.mockito.inline.dispatcher"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
\ No newline at end of file

From ad59afcc7612bda5f4c8bec523b1a885fadb23f9 Mon Sep 17 00:00:00 2001
From: Gopal <kris87us@gmail.com>
Date: Fri, 12 Nov 2021 10:31:50 -0700
Subject: [PATCH 2/2] Add EOF newline

---
 agent/android/dispatcher/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/android/dispatcher/build.gradle.kts b/agent/android/dispatcher/build.gradle.kts
index 6c63386d0..e6d4d37d9 100644
--- a/agent/android/dispatcher/build.gradle.kts
+++ b/agent/android/dispatcher/build.gradle.kts
@@ -26,4 +26,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-}
\ No newline at end of file
+}