From c7f0c8eccafd2f4d37a6ea9b9423e0730c8a20a2 Mon Sep 17 00:00:00 2001
From: Gopal <58731765+geekiyer@users.noreply.github.com>
Date: Sun, 14 Nov 2021 23:30:58 -0700
Subject: [PATCH 1/2] Upgrade Dokka version

---
 .../dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt b/plugins/dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt
index 4ea487097..07dce93a3 100644
--- a/plugins/dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt
+++ b/plugins/dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt
@@ -7,7 +7,7 @@ fun Project.kotlinVersion() = findProperty("kotlin.version")?.toString() ?: Deps
 object Deps {
     object Versions {
         const val androidTools = "4.1.1"
-        const val dokka = "1.4.20"
+        const val dokka = "1.5.30"
         const val kotlinDefault = "1.3.72"
         const val slfj = "1.7.26"
         const val logback = "1.2.3"

From 1addb66c0c275e5fa56bbaef1f29056ec1cf5df6 Mon Sep 17 00:00:00 2001
From: Gopalakrishnan Iyer <gopalakrishnan.iyer@aexp.com>
Date: Sun, 14 Nov 2021 23:40:16 -0700
Subject: [PATCH 2/2] Convert `mockk/dsl/common/build.gradle` to Kotlin DSL

---
 dsl/common/build.gradle     | 15 ---------------
 dsl/common/build.gradle.kts | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 dsl/common/build.gradle
 create mode 100644 dsl/common/build.gradle.kts

diff --git a/dsl/common/build.gradle b/dsl/common/build.gradle
deleted file mode 100644
index 503e3e490..000000000
--- a/dsl/common/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-plugins {
-    id("mpp-common")
-}
-
-ext {
-    mavenName = 'MockK DSL common'
-    mavenDescription = 'Common(JS and Java) MockK DSL providing API for MockK implementation'
-}
-
-apply from: "${gradles}/additional-archives.gradle"
-apply from: "${gradles}/upload.gradle"
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
diff --git a/dsl/common/build.gradle.kts b/dsl/common/build.gradle.kts
new file mode 100644
index 000000000..f508abede
--- /dev/null
+++ b/dsl/common/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("mpp-common")
+}
+
+extra["mavenName"] = "MockK DSL common"
+extra["mavenDescription"] = "Common(JS and Java) MockK DSL providing API for MockK implementation"
+
+apply(from = "${rootProject.extensions.extraProperties["gradles"]}/additional-archives.gradle")
+apply(from = "${rootProject.extensions.extraProperties["gradles"]}/upload.gradle")
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}