Fix publication issues (#435)

1. Allow bypassing signing (to test locally) 2. Fix task dependencies 3. Clean up build
JetBrains · Jul 6, 2024 · b718ff8 · b718ff8
1 parent 8928c77
commit b718ff8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/buildSrc/src/main/kotlin/icon-keys-generator.gradle.kts b/buildSrc/src/main/kotlin/icon-keys-generator.gradle.kts
@@ -11,6 +11,7 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.BaseKotlinCompile
 import java.lang.reflect.Field
@@ -57,6 +58,8 @@ extension.all item@{
     tasks {
         withType<BaseKotlinCompile> { dependsOn(task) }
         withType<Detekt> { dependsOn(task) }
+        withType<DokkaTask> { dependsOn(task) }
+        withType<Jar> { dependsOn(task) }
     }
 }
 
@@ -216,12 +219,6 @@ open class IconKeysGeneratorTask : DefaultTask() {
             .forEach { field ->
                 val fieldName = "${parentHolder.name}.${field.name}"
 
-                if (field.annotations.isNotEmpty()) {
-                    logger.lifecycle(
-                        "$fieldName -> ${field.annotations.joinToString { it!!.annotationClass.qualifiedName!! }}",
-                    )
-                }
-
                 if (field.annotations.any { it.annotationClass == java.lang.Deprecated::class }) {
                     logger.lifecycle("Ignoring deprecated field: $fieldName")
                     return

diff --git a/buildSrc/src/main/kotlin/intellij-theme-generator.gradle.kts b/buildSrc/src/main/kotlin/intellij-theme-generator.gradle.kts
@@ -3,6 +3,7 @@
 import com.squareup.kotlinpoet.ClassName
 import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.util.internal.GUtil
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.jewel.buildlogic.theme.IntelliJThemeGeneratorTask
 import org.jetbrains.jewel.buildlogic.theme.ThemeGeneration
 import org.jetbrains.jewel.buildlogic.theme.ThemeGeneratorContainer
@@ -30,6 +31,8 @@ extension.all {
     tasks {
         withType<BaseKotlinCompile> { dependsOn(task) }
         withType<Detekt> { dependsOn(task) }
+        withType<DokkaTask> { dependsOn(task) }
+        withType<Jar> { dependsOn(task) }
     }
 
     pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {

diff --git a/buildSrc/src/main/kotlin/jewel-publish.gradle.kts b/buildSrc/src/main/kotlin/jewel-publish.gradle.kts
@@ -11,22 +11,29 @@ val sourcesJar by tasks.registering(Jar::class) {
     from(kotlin.sourceSets.main.map { it.kotlin })
     archiveClassifier = "sources"
     destinationDirectory = layout.buildDirectory.dir("artifacts")
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 val javadocJar by tasks.registering(Jar::class) {
     from(tasks.dokkaHtml)
     archiveClassifier = "javadoc"
     destinationDirectory = layout.buildDirectory.dir("artifacts")
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 val publishingExtension = extensions.getByType<PublishingExtension>()
 
 signing {
     useInMemoryPgpKeys(
         System.getenv("PGP_PRIVATE_KEY") ?: properties["signing.privateKey"] as String?,
-        System.getenv("PGP_PASSWORD")?: properties["signing.password"] as String?
+        System.getenv("PGP_PASSWORD") ?: properties["signing.password"] as String?
     )
-    sign(publishingExtension.publications)
+
+    if (project.hasProperty("no-sign")) {
+        logger.warn("⚠️ CAUTION! NO-SIGN MODE ENABLED, PUBLICATIONS WON'T BE SIGNED")
+    } else {
+        sign(publishingExtension.publications)
+    }
 }
 
 publishing {

diff --git a/int-ui/int-ui-standalone/build.gradle.kts b/int-ui/int-ui-standalone/build.gradle.kts
@@ -21,16 +21,3 @@ intelliJThemeGenerator {
         ideaVersion = targetIdeaVersion
     }
 }
-
-tasks {
-    named("dokkaHtml") {
-        dependsOn("generateIntUiDarkTheme")
-        dependsOn("generateIntUiLightTheme")
-    }
-
-    named<Jar>("sourcesJar") {
-        dependsOn("generateIntUiDarkTheme")
-        dependsOn("generateIntUiLightTheme")
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
-}