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

Update Dokka to 1.6.10 #3184

Merged
merged 2 commits into from
Feb 11, 2022
Merged

Update Dokka to 1.6.10 #3184

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
6768c8d
Update Dokka to 1.6.10
qwwdfsad Feb 10, 2022
1ff1578
Remove redundant workaround
qwwdfsad Feb 11, 2022
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
2 changes: 0 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ buildscript {
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
mavenLocal()
}

Expand Down Expand Up @@ -128,7 +127,6 @@ allprojects {
google()
mavenCentral()
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
}
}

Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ repositories {
maven("https://plugins.gradle.org/m2")
}
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
if (buildSnapshotTrain) {
mavenLocal()
}
Expand Down
1 change: 0 additions & 1 deletion buildSrc/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
pluginManagement {
val build_snapshot_train: String? by settings
repositories {
maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true
if (cacheRedirectorEnabled) {
println("Redirecting repositories for buildSrc buildscript")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ atomicfu_version=0.17.0
knit_version=0.3.0
html_version=0.7.2
lincheck_version=2.14
dokka_version=1.6.0-dev-138
dokka_version=1.6.10
byte_buddy_version=1.10.9
reactor_version=3.4.1
reactive_streams_version=1.0.3
Expand Down
6 changes: 1 addition & 5 deletions gradle/dokka.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tasks.withType(DokkaTaskPartial::class).configureEach {
packageListUrl.set(rootProject.projectDir.toPath().resolve("site/stdlib.package.list").toUri().toURL())
}

if (project.name != "kotlinx-coroutines-core" && project.name != "kotlinx-coroutines-test") {
if (!project.isMultiplatform) {
dependsOn(project.configurations["compileClasspath"])
doFirst {
// resolve classpath only during execution
Expand Down Expand Up @@ -66,10 +66,6 @@ if (project.name == "kotlinx-coroutines-core") {
val jvmMain by getting {
makeLinkMapping(project.file("jvm"))
}

configureEach {
classpath.from(project.configurations["jvmCompileClasspath"].files)
}
}
}
}