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 +} 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"