move dokka block

a-sit-plus · Aug 16, 2023 · c6202cd · c6202cd
1 parent ba0cd50
commit c6202cd
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 50 deletions.
diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts
@@ -16,23 +16,6 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-val dokkaOutputDir = "$buildDir/dokka"
-tasks.dokkaHtml {
-//    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
-//    dependsOn(":vclib-openid:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
-    outputDirectory.set(file(dokkaOutputDir))
-}
-val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
-    delete(dokkaOutputDir)
-}
-val javadocJar = tasks.register<Jar>("javadocJar") {
-    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
-    archiveClassifier.set("javadoc")
-    from(dokkaOutputDir)
-}
-
-
-
 exportIosFramework("VcLibAriesKmm", *commonIosExports(), project(":vclib"))
 kotlin {
 
@@ -68,6 +51,22 @@ repositories {
 }
 
 
+val dokkaOutputDir = "$buildDir/dokka"
+tasks.dokkaHtml {
+//    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
+//    dependsOn(":vclib-openid:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
+    outputDirectory.set(file(dokkaOutputDir))
+}
+val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
+    delete(dokkaOutputDir)
+}
+val javadocJar = tasks.register<Jar>("javadocJar") {
+    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
+    archiveClassifier.set("javadoc")
+    from(dokkaOutputDir)
+}
+
+
 publishing {
     publications {
         withType<MavenPublication> {

diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts
@@ -16,21 +16,6 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-val dokkaOutputDir = "$buildDir/dokka"
-tasks.dokkaHtml {
-//    dependsOn(":vclib:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
-//    dependsOn(":vclib-aries:transformIosMainCInteropDependenciesMetadataForIde") //task dependency bug workaround
-    outputDirectory.set(file(dokkaOutputDir))
-}
-val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
-    delete(dokkaOutputDir)
-}
-val javadocJar = tasks.register<Jar>("javadocJar") {
-    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
-    archiveClassifier.set("javadoc")
-    from(dokkaOutputDir)
-}
-
 exportIosFramework("VcLibOpenIdKmm", *commonIosExports(), project(":vclib"))
 kotlin {
 
@@ -65,6 +50,18 @@ repositories {
     mavenCentral()
 }
 
+val dokkaOutputDir = "$buildDir/dokka"
+tasks.dokkaHtml {
+    outputDirectory.set(file(dokkaOutputDir))
+}
+val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
+    delete(dokkaOutputDir)
+}
+val javadocJar = tasks.register<Jar>("javadocJar") {
+    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
+    archiveClassifier.set("javadoc")
+    from(dokkaOutputDir)
+}
 
 publishing {
     publications {

diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -14,23 +14,6 @@ val artifactVersion: String by extra
 group = "at.asitplus.wallet"
 version = artifactVersion
 
-val dokkaOutputDir = "$buildDir/dokka"
-tasks.dokkaHtml {
-//    dependsOn("transformIosMainCInteropDependenciesMetadataForIde") //work around bug
-    outputDirectory.set(file(dokkaOutputDir))
-}
-val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
-    delete(dokkaOutputDir)
-}
-val javadocJar = tasks.register<Jar>("javadocJar") {
-    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
-    archiveClassifier.set("javadoc")
-    from(dokkaOutputDir)
-}
-
-
-
-
 exportIosFramework("VcLibKmm", *commonIosExports())
 kotlin {
 
@@ -91,6 +74,20 @@ repositories {
 }
 
 
+val dokkaOutputDir = "$buildDir/dokka"
+tasks.dokkaHtml {
+//    dependsOn("transformIosMainCInteropDependenciesMetadataForIde") //work around bug
+    outputDirectory.set(file(dokkaOutputDir))
+}
+val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
+    delete(dokkaOutputDir)
+}
+val javadocJar = tasks.register<Jar>("javadocJar") {
+    dependsOn(deleteDokkaOutputDir, tasks.dokkaHtml)
+    archiveClassifier.set("javadoc")
+    from(dokkaOutputDir)
+}
+
 publishing {
     publications {
         withType<MavenPublication> {
@@ -149,4 +146,10 @@ val signTasks = tasks.filter { it.name.startsWith("sign") }
 tasks.filter { it.name.startsWith("publish") }.forEach {
     println("DEP: ${it.name} now depends on ${signTasks.joinToString { it.name }}")
     it.dependsOn(*signTasks.toTypedArray())
-}
+}
+
+    tasks.dokkaHtml {
+        val transform = tasks.filter { it.name.startsWith("transform") }
+        println("adding dokkaHTML dependency to " + transform.joinToString { it.name })
+        dependsOn(*transform.toTypedArray())
+    }