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

CIDR: Always relax upper limit of product version in K/N plugin for non-public CIDR builds

Browse Source 
Issue #KT-29338:fixed
This commit is contained in:
Dmitriy Dolovov
2019-01-17 17:29:24 +07:00
parent 618a7c3747
commit 3c2d026128
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/cidr/cidrTasks.kt
+14 -5
View File
@@ -55,18 +55,27 @@ fun Copy.applyCidrVersionRestrictions(
pluginVersion: String
) {
val dotsCount = productVersion.count { it == '.' }
check(dotsCount >= 1 && dotsCount <= 2) {
check(dotsCount in 1..2) {
"Wrong CIDR product version format: $productVersion"
}
val sinceBuild = if (dotsCount == 1)
// private product versions don't have two dots
val privateProductVersion = dotsCount == 1
val applyStrictProductVersionLimitation = if (privateProductVersion && strictProductVersionLimitation) {
// it does not make sense for private versions to apply strict version limitation
logger.warn("Non-public CIDR product version [$productVersion] has been specified. The corresponding `versions.<product>.strict` property will be ignored.")
false
} else strictProductVersionLimitation
val sinceBuild = if (privateProductVersion)
productVersion
else
productVersion.substringBeforeLast('.')
val untilBuild = if (strictProductVersionLimitation)
// if strict then restrict plugin to the same single version of CLion or AppCode
sinceBuild + ".*"
val untilBuild = if (applyStrictProductVersionLimitation)
// if `strict` then restrict plugin to the same single version of CLion or AppCode
"$sinceBuild.*"
else
productVersion.substringBefore('.') + ".*"