Merge pull request #748 from geekiyer/690_kotlin_dsl1

Convert `mockk/dsl/common/build.gradle` to Kotlin DSL
mockk · Nov 15, 2021 · 3e8b8dd · 3e8b8dd
2 parents 2642329 + 1addb66
commit 3e8b8dd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/dsl/common/build.gradle b/dsl/common/build.gradle
diff --git a/dsl/common/build.gradle.kts 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
+}
diff --git 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"