Quick fix to avoid asking for the publishAllPublicationsToGitHubRepsi…

…tory task, if there are no GitHub credentials, and it's not set up. (#215)
xtclang · May 9, 2024 · b4080de · b4080de
1 parent 3d0bc68
commit b4080de
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/build-logic/common-plugins/src/main/kotlin/XdkDistribution.kt b/build-logic/common-plugins/src/main/kotlin/XdkDistribution.kt
@@ -93,9 +93,9 @@ fun SigningExtension.mavenCentralSigning(): List<Sign> = project.run {
  * property file.
  */
 fun PublishingExtension.mavenGitHubPackages(project: Project): Boolean = project.run {
-    val gitHubToken = project.getXdkProperty("org.xtclang.repo.github.token", System.getenv("GITHUB_TOKEN") ?: "")
+    val gitHubToken = project.getXtclangGitHubMavenPackageRepositoryToken()
     if (gitHubToken.isEmpty()) {
-        logger.warn("$prefix No GitHub token found, either in config or environment. publishRemote won't work.")
+        logger.warn("$prefix WARNING: No GitHub token found, either in config or environment. publishRemote won't work.")
         return false
     }
 

diff --git a/build-logic/common-plugins/src/main/kotlin/XdkProperties.kt b/build-logic/common-plugins/src/main/kotlin/XdkProperties.kt
@@ -211,3 +211,7 @@ class XdkPropertiesImpl(project: Project): XdkProjectBuildLogic(project), XdkPro
         return merge(to, local)
     }
 }
+
+fun Project.getXtclangGitHubMavenPackageRepositoryToken(): String {
+    return getXdkProperty("org.xtclang.repo.github.token", System.getenv("GITHUB_TOKEN") ?: "")
+}
diff --git a/build-logic/common-plugins/src/main/kotlin/org.xtclang.build.publish.gradle.kts b/build-logic/common-plugins/src/main/kotlin/org.xtclang.build.publish.gradle.kts
@@ -9,7 +9,8 @@ plugins {
     //id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
 }
 
-val semanticVersion: SemanticVersion by extra
+private val semanticVersion: SemanticVersion by extra
+private val gitHubToken = getXtclangGitHubMavenPackageRepositoryToken()
 
 publishing {
     repositories {
@@ -30,8 +31,6 @@ tasks.withType<PublishToMavenRepository>().configureEach {
 
 val publishAllPublicationsToMavenLocalRepository by tasks.existing
 
-val publishAllPublicationsToGitHubRepository by tasks.existing
-
 val publishLocal by tasks.registering {
     group = PUBLISH_TASK_GROUP
     description = "Task that publishes project publications to local repositories (e.g. GitHub and mavenCentral)."
@@ -41,7 +40,15 @@ val publishLocal by tasks.registering {
 val publishRemote by tasks.registering {
     group = PUBLISH_TASK_GROUP
     description = "Task that publishes project publications to remote repositories (e.g. mavenLocal)."
-    dependsOn(publishAllPublicationsToGitHubRepository)
+
+    if (gitHubToken.isNotEmpty()) {
+        dependsOn("publishAllPublicationsToGitHubRepository")
+    }
+    doLast {
+        if (gitHubToken.isEmpty()) {
+            throw buildException("ERROR: No remote repositories for remote publication are configured.")
+        }
+    }
 }
 
 val listTags by tasks.registering {

diff --git a/javatools/build.gradle.kts b/javatools/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
     alias(libs.plugins.tasktree)
 }
 
-val semanticVersion: SemanticVersion by extra
+private val semanticVersion: SemanticVersion by extra
 
 // TODO: Move these to common-plugins, the XDK composite build does use them in some different places.
 val xdkJavaToolsProvider by configurations.registering {

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.tasktree)
 }
 
-val semanticVersion: SemanticVersion by extra
+private val semanticVersion: SemanticVersion by extra
 
 private val pprefix = "org.xtclang"