Fix issues in composite build

johnsonlee · Jun 5, 2022 · 70b60e4 · 70b60e4
1 parent 8f4e4fb
commit 70b60e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/main/kotlin/io/johnsonlee/gradle/publish/ProjectExtensions.kt b/src/main/kotlin/io/johnsonlee/gradle/publish/ProjectExtensions.kt
@@ -10,7 +10,6 @@ import org.gradle.api.Project.DEFAULT_VERSION
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.kotlin.dsl.repositories
 import org.gradle.plugins.signing.SigningExtension
-import java.io.File
 import java.net.URI
 
 internal val SIGNING_PROPERTIES = arrayOf("signing.keyId", "signing.password", "signing.secretKeyRingFile")
@@ -59,7 +58,7 @@ val Project.useSonatype: Boolean
     get() = OSSRH_USERNAME != null && OSSRH_PASSWORD != null && OSSRH_PACKAGE_GROUP != null && hasSigningProperties
 
 val Project.git: Repository
-    get() = FileRepositoryBuilder().setGitDir(File(rootDir, ".git")).findGitDir().build()
+    get() = FileRepositoryBuilder().findGitDir(rootDir).setMustExist(useSonatype).build()
 
 val Project.license: License?
     get() = rootDir.listFiles()?.asSequence()?.mapNotNull(License.Companion::of)?.firstOrNull()
@@ -88,12 +87,12 @@ fun Project.configureDokka() {
             apply("org.jetbrains.dokka")
         }
     }
-    logger.info("Configuring `dokka` completed")
+    logger.info("[${this}] Configuring `dokka` completed")
 }
 
 fun Project.configureSigning() {
     if (!hasSigningProperties) {
-        logger.warn("Configuring `signing` skipped: ${SIGNING_PROPERTIES.joinToString(" or ") { "`${it}`" }} not found")
+        logger.warn("[${this}] Configuring `signing` skipped: ${SIGNING_PROPERTIES.joinToString(" or ") { "`${it}`" }} not found")
         return
     }
 
@@ -107,12 +106,12 @@ fun Project.configureSigning() {
         }
     }
 
-    logger.info("Configuring `signing` completed")
+    logger.info("[${this}] Configuring `signing` completed")
 }
 
 fun Project.configureNexusStaging() {
     if (OSSRH_USERNAME == null || OSSRH_PASSWORD == null || OSSRH_PACKAGE_GROUP == null) {
-        logger.warn("Configuring `nexusStaging` skipped: `OSSRH_USERNAME` or `OSSRH_PASSWORD` or `OSSRH_PACKAGE_GROUP` not found")
+        logger.warn("[${this}] Configuring `nexusStaging` skipped: `OSSRH_USERNAME` or `OSSRH_PASSWORD` or `OSSRH_PACKAGE_GROUP` not found")
         return
     }
 
@@ -129,12 +128,12 @@ fun Project.configureNexusStaging() {
         delayBetweenRetriesInMillis = 3000
     }
 
-    logger.info("Configuring `nexusStaging` {serverUrl=`${stagingUrl}`, packageGroup=`${OSSRH_PACKAGE_GROUP}`} completed")
+    logger.info("[${this}] Configuring `nexusStaging` {serverUrl=`${stagingUrl}`, packageGroup=`${OSSRH_PACKAGE_GROUP}`} completed")
 }
 
 fun Project.configureNexusPublish() {
     if (OSSRH_USERNAME == null || OSSRH_PASSWORD == null) {
-        logger.warn("Configuring `nexusPublishing` skipped: `OSSRH_USERNAME` or `OSSRH_PASSWORD` not found")
+        logger.warn("[${this}] Configuring `nexusPublishing` skipped: `OSSRH_USERNAME` or `OSSRH_PASSWORD` not found")
         return
     }
 
@@ -149,7 +148,7 @@ fun Project.configureNexusPublish() {
         }
     }
 
-    logger.info("Configuring `nexusPublishing` completed")
+    logger.info("[${this}] Configuring `nexusPublishing` completed")
 }
 
 fun Project.configureMavenRepository() {

diff --git a/src/main/kotlin/io/johnsonlee/gradle/publish/RepositoryHandlerExtensions.kt b/src/main/kotlin/io/johnsonlee/gradle/publish/RepositoryHandlerExtensions.kt
@@ -16,15 +16,15 @@ fun RepositoryHandler.configureNexus(project: Project, repository: String = "/co
                 password = project.NEXUS_PASSWORD
             }
         }
-        project.logger.info("Configuring nexus {url=`${nexusUrl}`} completed")
+        project.logger.info("[${project}] Configuring nexus {url=`${nexusUrl}`} completed")
     } else {
-        project.logger.warn("Configuring nexus skipped: `NEXUS_URL` or `NEXUS_USERNAME` or `NEXUS_PASSWORD` not found")
+        project.logger.warn("[${project}] Configuring nexus skipped: `NEXUS_URL` or `NEXUS_USERNAME` or `NEXUS_PASSWORD` not found")
     }
 }
 
 fun RepositoryHandler.configureSonatype(project: Project) {
     val sonatype = maven {
         url = project.OSSRH_SERVER_URL.resolve("/service/local/staging/deploy/maven2/")
     }
-    project.logger.info("Configuring sonatype repository {url=`${sonatype.url}`} completed")
+    project.logger.info("[${project}] Configuring sonatype repository {url=`${sonatype.url}`} completed")
 }