azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force usage of passed deploy url for sonatype publication (KTI-552)

Browse Source
This commit is contained in:
Nikolay Krasko
2021-04-28 20:44:36 +03:00
parent 2eda82f178
commit 624740a80a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -381,7 +381,7 @@ apply {
} }
apply { apply {
if (extra["isSonatypeRelease"] as? Boolean == true) { if (extra["isSonatypeRelease"] as? Boolean == true && (extra["deployRepoUrlCustom"] as? String) == null) {
logger.info("Applying configuration for sonatype release") logger.info("Applying configuration for sonatype release")
from("libraries/prepareSonatypeStaging.gradle") from("libraries/prepareSonatypeStaging.gradle")
} }
libraries/commonConfiguration.gradle
+5 -6
View File
@@ -110,17 +110,16 @@ task preparePublication {
project.ext.isSonatypePublish = repoProvider == 'sonatype' project.ext.isSonatypePublish = repoProvider == 'sonatype'
project.ext.isSonatypeRelease = isSonatypePublish && isRelease project.ext.isSonatypeRelease = isSonatypePublish && isRelease
project.ext['signing.keyId'] = project.properties['kotlin.key.name'] project.ext.deployRepoUrlCustom = properties["deployRepoUrl"] ?: properties["deploy-url"]
project.ext['signing.password'] = project.properties['kotlin.key.passphrase']
String sonatypeSnapshotsUrl = (isSonatypePublish && !isRelease) ? "https://oss.sonatype.org/content/repositories/snapshots/" : null String sonatypeSnapshotsUrl = (isSonatypePublish && !isRelease) ? "https://oss.sonatype.org/content/repositories/snapshots/" : null
String repoFolder = properties["deployRepoFolder"] ?: "repo" String repoFolder = properties["deployRepoFolder"] ?: "repo"
ext.repoUrl = properties["deployRepoUrl"] ?: sonatypeSnapshotsUrl ?: properties["deploy-url"] ?: "file://${rootProject.buildDir}/${repoFolder}".toString()
ext.repoUrl = project.ext.deployRepoUrlCustom ?: sonatypeSnapshotsUrl ?: "file://${rootProject.buildDir}/${repoFolder}"
logger.info("Deployment repository preliminary url: $repoUrl ($repoProvider)")
ext.username = properties["deployRepoUsername"] ?: properties["kotlin.${repoProvider}.user"] ext.username = properties["deployRepoUsername"] ?: properties["kotlin.${repoProvider}.user"]
ext.password = properties["deployRepoPassword"] ?: properties["kotlin.${repoProvider}.password"] ext.password = properties["deployRepoPassword"] ?: properties["kotlin.${repoProvider}.password"]
logger.info("Deployment repository preliminary url: $repoUrl ($repoProvider)")
doLast { doLast {
println("Deployment repository url: $repoUrl") println("Deployment repository url: $repoUrl")
} }