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

[KLIB] Removed support of pattern '<library_name>@<version>' (KT-42500 Fixed)

Browse Source
This commit is contained in:
Elena Lepilkina
2021-09-29 16:25:29 +03:00
committed by Space
parent 65d40c2253
commit 416719c216
2 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryUtils.kt
+1 -5
View File
@@ -31,9 +31,5 @@ fun File.unpackZippedKonanLibraryTo(newDir: File) {
val List<String>.toUnresolvedLibraries
get() = this.map {
val version = it.substringAfterLast('@', "")
.let { if (it.isEmpty()) null else it }
val name = it.substringBeforeLast('@')
UnresolvedLibrary(name, version)
UnresolvedLibrary(it, null)
}
kotlin-native/backend.native/tests/build.gradle
-39
View File
@@ -5103,45 +5103,6 @@ dynamicTest("interop_exceptions_throwThroughBridge") {
interop = "exceptions_throwThroughBridge"
}
tasks.register("library_mismatch", KonanDriverTest) {
// Does not work for cross targets yet.
enabled = !(project.testTarget != null && project.target.name != project.hostName)
def dir = buildDir.absolutePath
def lib = "$projectDir/link/versioning/empty.kt"
def currentTarget = project.target.name
def someOtherTarget = (project.testTarget == 'wasm32' ? project.hostName : 'wasm32')
if (!useCustomDist) {
// we actually need any target other than the current one.
dependsOn ':kotlin-native:wasm32CrossDistRuntime'
dependsOn ':kotlin-native:wasm32CrossDistEndorsedLibraries'
}
doBeforeBuild {
konanc("$lib -p library -o $dir/1.2/empty -target $currentTarget -lv 1.2")
konanc("$lib -p library -o $dir/3.4/empty -target $someOtherTarget")
konanc("$lib -p library -o $dir/5.6/empty -target $currentTarget -lv 5.6")
konanc("$lib -p library -o $dir/7.8/empty -target $currentTarget -lv 7.8")
}
source = "link/versioning/hello.kt"
flags = ['-l', 'empty@5.6', '-r', "$dir/1.2", '-r', "$dir/3.4", '-r', "$dir/5.6"]
compilerMessages = true
def messages =
"warning: skipping $dir/1.2/empty.klib. The library versions don't match. Expected '5.6', found '1.2'\n" +
//"warning: skipping $dir/3.4/empty.klib. The target doesn't match. Expected '$currentTarget', found [$someOtherTarget]\n" +
"Hello, versioned world!\n"
messages = PlatformInfo.isWindows() ? messages.replaceAll('\\/', '\\\\') : messages
outputChecker = { out ->
def outV = out.split("\n").findAll{ !it.startsWith("WARNING: ") }.join("\n")
messages.split("\n")
.collect { line -> outV.contains(line) }
.every { it == true }
}
}
tasks.register("library_ir_provider_mismatch", KonanDriverTest) {
def dir = buildDir.absolutePath
def lib = "$projectDir/link/ir_providers/library/empty.kt"