InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-11-26 03:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "potential fix of dokka"

Browse Source 
This reverts commit 31022733ac.
This commit is contained in:
InsanusMokrassar 2022-12-05 06:57:29 +06:00
parent 03b3ddd98b
commit 41504469db
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dokka/build.gradle
View File

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

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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