Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert mockk/dsl/common/build.gradle to Kotlin DSL #748

Merged
merged 2 commits into from Nov 15, 2021
Merged

Convert mockk/dsl/common/build.gradle to Kotlin DSL #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f0c8e
Upgrade Dokka version
geekiyer Nov 15, 2021
1addb66
Convert `mockk/dsl/common/build.gradle` to Kotlin DSL
geekiyer Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 0 additions & 15 deletions dsl/common/build.gradle
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions dsl/common/build.gradle.kts
View file
Open in desktop
@@ -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
}
2 changes: 1 addition & 1 deletion plugins/dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt
View file
Open in desktop
Expand Up @@ -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"
Expand Down