try build again

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

Hide file tree

Showing 4 changed files with 6 additions and 74 deletions.
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/vclib-aries/build.gradle.kts b/vclib-aries/build.gradle.kts
@@ -1,7 +1,4 @@
-import at.asitplus.gradle.bouncycastle
-import at.asitplus.gradle.commonImplementationDependencies
-import at.asitplus.gradle.commonIosExports
-import at.asitplus.gradle.exportIosFramework
+import at.asitplus.gradle.*
 
 plugins {
     kotlin("multiplatform")
@@ -50,22 +47,7 @@ repositories {
     mavenCentral()
 }
 
-
-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)
-}
-
+val javadocJar = setupDokka()
 
 publishing {
     publications {
@@ -118,9 +100,3 @@ signing {
     useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign(publishing.publications)
 }
-
-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())
-}
diff --git a/vclib-openid/build.gradle.kts b/vclib-openid/build.gradle.kts
@@ -1,7 +1,4 @@
-import at.asitplus.gradle.bouncycastle
-import at.asitplus.gradle.commonImplementationDependencies
-import at.asitplus.gradle.commonIosExports
-import at.asitplus.gradle.exportIosFramework
+import at.asitplus.gradle.*
 
 plugins {
     kotlin("multiplatform")
@@ -50,18 +47,7 @@ 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)
-}
+val javadocJar = setupDokka()
 
 publishing {
     publications {
@@ -114,9 +100,3 @@ signing {
     useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign(publishing.publications)
 }
-
-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())
-}
diff --git a/vclib/build.gradle.kts b/vclib/build.gradle.kts
@@ -74,19 +74,7 @@ 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)
-}
+val javadocJar = setupDokka()
 
 publishing {
     publications {
@@ -141,15 +129,3 @@ signing {
     useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign(publishing.publications)
 }
-
-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())
-    }