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

Remove old aliases for publishing parameters and prepare new

Browse Source 
KTI-1377
This commit is contained in:
Nikolay Krasko
2023-09-14 15:47:14 +02:00
committed by Space Team
parent 3ddbf04fc8
commit fabd5f6231
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/preparePublication.kt
+6 -7
View File
@@ -16,29 +16,28 @@ fun Project.preparePublication() {
) )
val isRelease: Boolean by extra(!project.version.toString().contains("-SNAPSHOT")) val isRelease: Boolean by extra(!project.version.toString().contains("-SNAPSHOT"))
val repo: String? = properties["deployRepo"]?.toString() ?: properties["deploy-repo"]?.toString() val repo: String? = properties["kotlin.build.deploy-repo"]?.toString() ?: properties["deploy-repo"]?.toString()
val repoProvider = repositoryProviders.getOrDefault(repo, repo) val repoProvider = repositoryProviders.getOrDefault(repo, repo)
val isSonatypePublish: Boolean by extra(repoProvider == "sonatype") val isSonatypePublish: Boolean by extra(repoProvider == "sonatype")
val isSonatypeRelease: Boolean by extra(isSonatypePublish && isRelease) val isSonatypeRelease: Boolean by extra(isSonatypePublish && isRelease)
val deployRepoUrl = (properties["deployRepoUrl"] ?: properties["deploy-url"])?.toString()?.takeIf { it.isNotBlank() } val deployRepoUrl = (properties["kotlin.build.deploy-url"] ?: properties["deploy-url"])?.toString()?.takeIf { it.isNotBlank() }
val deployFolder = properties["deployRepoFolder"]?.toString()
?.let { "file://${rootProject.buildDir}/$it" }
val sonatypeSnapshotsUrl = if (isSonatypePublish && !isRelease) { val sonatypeSnapshotsUrl = if (isSonatypePublish && !isRelease) {
"https://oss.sonatype.org/content/repositories/snapshots/" "https://oss.sonatype.org/content/repositories/snapshots/"
} else { } else {
null null
} }
val deployUrlFromParameters = deployRepoUrl ?: deployFolder ?: sonatypeSnapshotsUrl val deployUrlFromParameters = deployRepoUrl ?: sonatypeSnapshotsUrl
val repoUrl: String by extra((deployUrlFromParameters ?: "file://${rootProject.buildDir}/repo").toString()) val repoUrl: String by extra((deployUrlFromParameters ?: "file://${rootProject.buildDir}/repo").toString())
logger.info("Deployment repository preliminary url: $repoUrl ($repoProvider)") logger.info("Deployment repository preliminary url: $repoUrl ($repoProvider)")
val username: String? by extra( val username: String? by extra(
properties["deployRepoUsername"]?.toString() ?: properties["kotlin.${repoProvider}.user"]?.toString() properties["kotlin.build.deploy-username"]?.toString() ?: properties["kotlin.${repoProvider}.user"]?.toString()
) )
val password: String? by extra( val password: String? by extra(
properties["deployRepoPassword"]?.toString() ?: properties["kotlin.${repoProvider}.password"]?.toString() properties["kotlin.build.deploy-password"]?.toString() ?: properties["kotlin.${repoProvider}.password"]?.toString()
) )
doLast { doLast {