Skip to content

Commit 70d0ec7

Browse files
authored
Update Dokka to 1.6.10 (#3184)
* Update Dokka to 1.6.10
1 parent ff80ba2 commit 70d0ec7

File tree

5 files changed

+2
-10
lines changed

5 files changed

+2
-10
lines changed

build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ buildscript {
4646
mavenCentral()
4747
maven { url "https://plugins.gradle.org/m2/" }
4848
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
49-
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
5049
mavenLocal()
5150
}
5251

@@ -128,7 +127,6 @@ allprojects {
128127
google()
129128
mavenCentral()
130129
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
131-
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
132130
}
133131
}
134132

buildSrc/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ repositories {
1919
maven("https://plugins.gradle.org/m2")
2020
}
2121
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
22-
maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
2322
if (buildSnapshotTrain) {
2423
mavenLocal()
2524
}

buildSrc/settings.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
pluginManagement {
55
val build_snapshot_train: String? by settings
66
repositories {
7-
maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
87
val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true
98
if (cacheRedirectorEnabled) {
109
println("Redirecting repositories for buildSrc buildscript")

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ atomicfu_version=0.17.0
1414
knit_version=0.3.0
1515
html_version=0.7.2
1616
lincheck_version=2.14
17-
dokka_version=1.6.0-dev-138
17+
dokka_version=1.6.10
1818
byte_buddy_version=1.10.9
1919
reactor_version=3.4.1
2020
reactive_streams_version=1.0.3

gradle/dokka.gradle.kts

+1-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tasks.withType(DokkaTaskPartial::class).configureEach {
3737
packageListUrl.set(rootProject.projectDir.toPath().resolve("site/stdlib.package.list").toUri().toURL())
3838
}
3939

40-
if (project.name != "kotlinx-coroutines-core" && project.name != "kotlinx-coroutines-test") {
40+
if (!project.isMultiplatform) {
4141
dependsOn(project.configurations["compileClasspath"])
4242
doFirst {
4343
// resolve classpath only during execution
@@ -66,10 +66,6 @@ if (project.name == "kotlinx-coroutines-core") {
6666
val jvmMain by getting {
6767
makeLinkMapping(project.file("jvm"))
6868
}
69-
70-
configureEach {
71-
classpath.from(project.configurations["jvmCompileClasspath"].files)
72-
}
7369
}
7470
}
7571
}

0 commit comments

Comments
 (0)