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

Revert "[tests][kotlin-gradle-plugin] workaround for old k/n artifacts"

Browse Source 
This reverts commit f051119c to drop obsolete native version support
This commit is contained in:
Pavel Punegov
2021-05-05 17:49:17 +03:00
parent fa525a8359
commit a0d35e56a9
2 changed files with 34 additions and 35 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/NativePlatformLibsIT.kt
+1 -2
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.extractNativ
import org.jetbrains.kotlin.gradle.transformProjectWithPluginsDsl
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
import org.jetbrains.kotlin.gradle.utils.toStringPre1_5_20
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.presetName
@@ -55,7 +54,7 @@ class NativePlatformLibsIT : BaseGradleIT() {
// Clean existing installation directories.
val osName = HostManager.simpleOsName()
val oldCompilerDir = DependencyDirectories.localKonanDir.resolve("kotlin-native-$osName-$oldCompilerVersion")
val currentCompilerDir = DependencyDirectories.localKonanDir.resolve("kotlin-native-$osName-${currentCompilerVersion.toStringPre1_5_20()}")
val currentCompilerDir = DependencyDirectories.localKonanDir.resolve("kotlin-native-$osName-$currentCompilerVersion")
for (compilerDirectory in listOf(oldCompilerDir, currentCompilerDir)) {
compilerDirectory.deleteRecursively()