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

[K/N] Remove old Compiler and Meta Version ^KT-55677 Fixed

Browse Source 
* Replace it with KotlinCompilerVersion
* K/N version should be set now with `deployVersion`.
* Cleanup deprecated functions in older versions
 of the Gradle plugin
* Cleanup tests for older versions of compiler downloader

Merge-request: KT-MR-8436
Merged-by: Pavel Punegov <Pavel.Punegov@jetbrains.com>
This commit is contained in:
Pavel Punegov
2023-01-30 13:10:08 +00:00
committed by Space Team
parent 5ec626b29d
commit c9aeadd31f
33 changed files with 79 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-io/test/org/jetbrains/kotlin/native/NativeCompilerVersionTest.kt
-160
View File
@@ -1,160 +0,0 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.native
import org.jetbrains.kotlin.konan.*
import org.junit.Assert.assertEquals
import org.junit.Test
import kotlin.test.*
class NativeCompilerVersionTest {
@Test
fun versionParseTest() {
"1.5.30-dev-1".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.DEV, meta)
assertEquals(1, build)
}
"1.5.30-rc-12".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.RC, meta)
assertEquals(12, build)
}
// Final release
"1.5.30".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.RELEASE, meta)
assertEquals(-1, build)
}
// Final release build.number
"1.5.30-release-34".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.RELEASE, meta)
assertEquals(34, build)
}
// Release builds
"1.5.30-1234".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.RELEASE, meta)
assertEquals(1234, build)
}
"1.6.0-dev-1".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(0, maintenance)
assertEquals(MetaVersion.DEV, meta)
assertEquals(1, build)
}
"1.6.10-RC".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(10, maintenance)
assertEquals(MetaVersion.RC, meta)
assertEquals(-1, build)
}
}
@Test
fun incorrectVersionString() {
assertFailsWith<IllegalArgumentException> { CompilerVersion.fromString("1.5.30-M1-dev-123") }
assertFailsWith<IllegalArgumentException> { CompilerVersion.fromString("1.5.30-M1-release-123") }
assertFailsWith<IllegalArgumentException> { CompilerVersion.fromString("1.5.30.40-release-123") }
}
@Test
fun versionToString() {
assertEquals("1.5.30-dev-140", CompilerVersionImpl(MetaVersion.DEV, 1, 5, 30, -1, 140).toString())
assertEquals("1.5.30-RC-140", CompilerVersionImpl(MetaVersion.RC, 1, 5, 30, -1, 140).toString())
assertEquals("1.5.30-RC", CompilerVersionImpl(MetaVersion.RC, 1, 5, 30, -1, -1).toString())
assertEquals("1.6.10-14", CompilerVersionImpl(MetaVersion.RELEASE, 1, 6, 10, -1, 14).toString())
assertEquals("1.6.10-14", CompilerVersionImpl(MetaVersion.RELEASE, 1, 6, 10, -1, 14).toString())
assertEquals("1.6.0", CompilerVersionImpl(MetaVersion.RELEASE, 1, 6, 0, -1, -1).toString())
}
@Test
fun publicVersion() {
"1.5.30-dev-google-pr-123".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.DEV_GOOGLE, meta)
assertEquals(123, build)
}
assertEquals("1.5.30-dev-google-pr-140", CompilerVersionImpl(MetaVersion.DEV_GOOGLE, 1, 5, 30, -1, 140).toString())
"1.5.30-pub-123".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(5, minor)
assertEquals(30, maintenance)
assertEquals(MetaVersion.PUB, meta)
assertEquals(123, build)
}
assertEquals("1.5.30-PUB-140", CompilerVersionImpl(MetaVersion.PUB, 1, 5, 30, -1, 140).toString())
}
@Test
fun betasAndRCs() {
"1.7.0-RC".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(7, minor)
assertEquals(0, maintenance)
assertEquals(MetaVersion.RC, meta)
assertEquals(-1, build)
}
"1.7.0-RC2".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(7, minor)
assertEquals(0, maintenance)
assertEquals(MetaVersion("RC2"), meta)
assertEquals(-1, build)
}
"1.7.0-RC2-123".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(7, minor)
assertEquals(0, maintenance)
assertEquals(MetaVersion("RC2"), meta)
assertEquals(123, build)
}
"1.7.0-Beta".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(7, minor)
assertEquals(0, maintenance)
assertEquals(MetaVersion.BETA, meta)
assertEquals(-1, build)
}
"1.7.0-Beta2".parseCompilerVersion().apply {
assertEquals(1, major)
assertEquals(7, minor)
assertEquals(0, maintenance)
assertEquals(MetaVersion("Beta2"), meta)
assertEquals(-1, build)
}
}
@Test
fun metaVersionOrder() {
assertTrue("1.7.0-RC2".parseCompilerVersion().isAtLeast("1.7.0-RC".parseCompilerVersion()))
assertTrue("1.7.0-RC".parseCompilerVersion().isAtLeast("1.7.0-BETA".parseCompilerVersion()))
assertTrue("1.7.0-RC".parseCompilerVersion().isAtLeast("1.7.0-BETA2".parseCompilerVersion()))
assertTrue("1.7.0-RC2".parseCompilerVersion().isAtLeast("1.7.0-BETA3".parseCompilerVersion()))
assertTrue("1.7.0-release".parseCompilerVersion().isAtLeast("1.7.0-RC".parseCompilerVersion()))
assertTrue("1.7.0-release".parseCompilerVersion().isAtLeast("1.7.0-RC3".parseCompilerVersion()))
assertTrue("1.7.0-release".parseCompilerVersion().isAtLeast("1.7.0-dev-1234".parseCompilerVersion()))
assertTrue("1.7.0-eap1".parseCompilerVersion().isAtLeast("1.7.0-eap".parseCompilerVersion()))
assertTrue("1.7.0-eap1".parseCompilerVersion().isAtLeast("1.7.0-eap-134".parseCompilerVersion()))
}
}