potential fix of dokka

This commit is contained in:
InsanusMokrassar 2022-12-04 19:00:16 +06:00
parent f9a8c39879
commit 31022733ac
2 changed files with 12 additions and 9 deletions

View File

@ -17,7 +17,7 @@ kotlin {
// browser()
// nodejs()
// }
android {}
android()
sourceSets {
commonMain {
@ -30,8 +30,8 @@ kotlin {
&& it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") }
// && it.kotlin.sourceSets.any { it.name.contains("jsMain") }
&& it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
&& it.kotlin.sourceSets.any { it.name.contains("androidMain") }
// && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
// && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
) {
api it
}
@ -62,7 +62,7 @@ kotlin {
if (
it != project
&& it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") }
// && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
&& it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
) {
api it
@ -78,9 +78,12 @@ kotlin {
if (
it != project
&& it.hasProperty("kotlin")
&& it.kotlin.sourceSets.any { it.name.contains("commonMain") }
// && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
&& it.kotlin.sourceSets.any { it.name.contains("androidMain") }
) {
it.kotlin.sourceSets.forEach {
println(it.dependsOn)
}
api it
}
}
@ -100,7 +103,7 @@ private List<SourceDirectorySet> findSourcesWithName(String... approximateNames)
}.collect { it.kotlin }
}
tasks.dokkaHtml {
dokkaHtml {
dokkaSourceSets {
configureEach {
skipDeprecated.set(true)
@ -121,11 +124,11 @@ tasks.dokkaHtml {
// }
named("jvmMain") {
sourceRoots.setFrom(findSourcesWithName("jvmMain", "commonMain"))
sourceRoots.setFrom(findSourcesWithName("jvmMain"))
}
named("androidMain") {
sourceRoots.setFrom(findSourcesWithName("androidMain", "commonMain"))
sourceRoots.setFrom(findSourcesWithName("androidMain"))
}
}
}

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists