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

[KGP] Changed type of determining maturity version for k/n

Browse Source 
#KT-62927 Fixed

Merge-request: KT-MR-12742
Merged-by: Dmitrii Krasnov <Dmitrii.Krasnov@jetbrains.com>
This commit is contained in:
Dmitrii Krasnov
2023-10-27 08:20:44 +00:00
committed by Space Team
parent 8821f8d1a4
commit 1a9cd81a85
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt
+8 -6
View File
@@ -14,6 +14,9 @@ import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.presetName import org.jetbrains.kotlin.konan.target.presetName
import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion
import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion.Maturity.*
import org.jetbrains.kotlin.tooling.core.buildNumber
import org.junit.jupiter.api.Assumptions import org.junit.jupiter.api.Assumptions
import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.condition.OS import org.junit.jupiter.api.condition.OS
@@ -368,13 +371,12 @@ class NativeDownloadAndPlatformLibsIT : KGPBaseTest() {
) )
private fun mavenUrl(): String { private fun mavenUrl(): String {
val versionPattern = "(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-(\\p{Alpha}*\\p{Alnum}|[\\p{Alpha}-]*))?(?:-(\\d+))?".toRegex() val kotlinToolingVersion = KotlinToolingVersion(currentCompilerVersion)
val (_, _, _, metaString, build) = versionPattern.matchEntire(currentCompilerVersion)?.destructured val maturity = kotlinToolingVersion.maturity
?: error("Unable to parse version $currentCompilerVersion") val buildNumber = kotlinToolingVersion.buildNumber
return when { return when {
metaString == "dev" || build.isNotEmpty() -> KOTLIN_SPACE_DEV maturity == DEV || buildNumber != null -> KOTLIN_SPACE_DEV
metaString in listOf("RC", "RC2", "Beta") || metaString.isEmpty() -> MAVEN_CENTRAL else -> MAVEN_CENTRAL
else -> throw IllegalStateException("Not a published version $currentCompilerVersion")
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerDownloader.kt
+3 -4
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.gradle.targets.native.internal.PlatformLibrariesGene
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.util.DependencyDirectories import org.jetbrains.kotlin.konan.util.DependencyDirectories
import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion
import java.io.File import java.io.File
import java.nio.file.Files import java.nio.file.Files
@@ -113,12 +114,10 @@ class NativeCompilerDownloader(
} }
private val repoUrl by lazy { private val repoUrl by lazy {
val versionPattern = "(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-(\\p{Alpha}*\\p{Alnum}|[\\p{Alpha}-]*))?(?:-(\\d+))?".toRegex() val maturity = KotlinToolingVersion(compilerVersion).maturity
val (_, _, _, buildType, _) = versionPattern.matchEntire(compilerVersion)?.destructured
?: error("Unable to parse version $compilerVersion")
buildString { buildString {
append("${kotlinProperties.nativeBaseDownloadUrl}/") append("${kotlinProperties.nativeBaseDownloadUrl}/")
append(if (buildType in listOf("RC", "RC2", "Beta") || buildType.isEmpty()) "releases/" else "dev/") append(if (maturity == KotlinToolingVersion.Maturity.DEV) "dev/" else "releases/")
append("$compilerVersion/") append("$compilerVersion/")
append(simpleOsName) append(simpleOsName)
} }