Skip to content

Commit 267eec6

Browse files
committed
chore: minor refactoring of dokka and cover plugin configs
1 parent 20bd8a3 commit 267eec6

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ plugins {
44
// kotlin("multiplatform") apply false
55
}
66

7-
dependencies { project.subprojects.forEach { kover(it) } }
8-
9-
tasks.dokkaHtmlMultiModule { moduleName = "Kotlin Multiplatform Playground!" }
7+
description = "Kotlin Multiplatform Playground!"

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,26 @@ import common.libs
55
import java.net.URI
66
import kotlinx.validation.ApiValidationExtension
77
import org.jetbrains.dokka.DokkaConfiguration.Visibility
8+
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
89
import org.jetbrains.dokka.gradle.DokkaTaskPartial
910

1011
plugins {
1112
id("org.jetbrains.dokka")
1213
id("org.jetbrains.kotlinx.kover")
1314
}
1415

15-
// Apply bin-compat validator plugin to the root project.
16+
// The following plugins and config apply only to a root project.
1617
if (project == rootProject) {
1718
apply(plugin = "org.jetbrains.kotlinx.binary-compatibility-validator")
19+
20+
// For combined Kotlin coverage report
21+
dependencies { project.subprojects.forEach { kover(it) } }
22+
23+
// Dokka multi-module config.
24+
tasks.withType<DokkaMultiModuleTask>().configureEach {
25+
description = project.description.orEmpty()
26+
moduleName = project.name
27+
}
1828
}
1929

2030
// Configure bin-compat validator.

gradle/libs.versions.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ publish-org-url = "https://suresh.dev"
2222
publish-scm-url = "https://github.com/sureshg/kotlin-mpp-playground"
2323

2424
# Gradle Dependencies Versions
25-
kotlinx-kover = "0.7.2"
25+
kotlinx-kover = "0.7.3"
2626
kotlinx-io = "0.2.1"
2727
kotlinx-atomicfu = "0.21.0"
2828
kotlinx-coroutines = "1.7.3"
@@ -34,7 +34,7 @@ kotlinx-html = "0.9.1"
3434
kotlinx-benchmark = "0.4.8"
3535
kotlinx-reflect-lite = "1.1.0"
3636
kotlinx-bincompat = "0.13.2"
37-
kotlin-wrappers = "1.0.0-pre.601"
37+
kotlin-wrappers = "1.0.0-pre.602"
3838
zip-prefixer = "0.3.1"
3939
ajalt-mordant = "2.0.1"
4040
ajalt-clikt = "4.1.0"
@@ -90,7 +90,11 @@ hikariCP = "5.0.1"
9090
h2 = "2.2.220"
9191
micrometer = "1.11.2"
9292
swagger-ui = "5.1.3"
93+
hoplite = "2.8.0-RC1"
9394
config4k = "0.6.0"
95+
shedlock = "5.6.0"
96+
sherlock = "0.4.19"
97+
expiringmap = "0.5.10"
9498
apache-commons-imaging = "1.0-alpha3"
9599

96100
# NPM Dependencies
@@ -122,6 +126,7 @@ jetbrains-compose = "1.4.3"
122126
jetbrains-compose-compiler = "1.5.0"
123127
cash-molecule = "1.1.0"
124128
npm-publish-plugin = "3.4.1"
129+
exposed-plugin = "0.2.1"
125130

126131

127132
[libraries]
@@ -163,6 +168,7 @@ build-jetbrains-compose-mpp = { module = "org.jetbrains.compose:compose
163168
build-jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime" , version.ref = "jetbrains-compose"}
164169
build-jetbrains-compose-compiler = { module = "org.jetbrains.compose.compiler:compiler" , version.ref = "jetbrains-compose-compiler"}
165170
build-npm-publish-plugin = { module = "dev.petuska:npm-publish-gradle-plugin" , version.ref = "npm-publish-plugin"}
171+
build-exposed-plugin = { module = "gradle.plugin.com.jetbrains.exposed.gradle:plugin" , version.ref = "exposed-plugin"}
166172

167173
# Gradle Dependencies
168174
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom" , version.ref = "kotlin"}
@@ -241,6 +247,10 @@ hikariCP = { module = "com.zaxxer:HikariCP"
241247
micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus" , version.ref = "micrometer"}
242248
h2 = { module = "com.h2database:h2" , version.ref = "h2"}
243249
config4k = { module = "io.github.config4k:config4k" , version.ref = "config4k"}
250+
hoplite-hocon = { module = "com.sksamuel.hoplite:hoplite-hocon" , version.ref = "hoplite"}
251+
expiringmap = { module = "net.jodah:expiringmap" , version.ref = "expiringmap"}
252+
shedlock-jdbc = { module = "net.javacrumbs.shedlock:shedlock-provider-jdbc" , version.ref = "shedlock"}
253+
sherlock-sql = { module = "com.coditory.sherlock:sherlock-sql" , version.ref = "sherlock"}
244254

245255
kotlin-retry = { module = "com.michael-bull.kotlin-retry:kotlin-retry" , version.ref = "kotlin-retry" }
246256
kotest-core = { module = "io.kotest:kotest-assertions-core" , version.ref = "kotest"}
@@ -367,6 +377,8 @@ ktor-client = [
367377
[plugins]
368378
kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen" , version.ref = "kotlin"}
369379
kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark" , version.ref = "kotlinx-benchmark" }
380+
ktor = { id = "io.ktor.plugin" , version.ref = "ktor" }
381+
exposed = { id = "com.jetbrains.exposed.gradle.plugin" , version.ref = "exposed-plugin" }
370382
jte = { id = "gg.jte.gradle" , version.ref = "jte" }
371383
benmanes = { id = "com.github.ben-manes.versions" , version.ref = "benmanes" }
372384
bestpractices = { id = "com.autonomousapps.plugin-best-practices-plugin" , version.ref = "best-practices-plugin" }

0 commit comments

Comments
 (0)