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

[Gradle] Use : as a separator for group and name in klib unique names

Browse Source
This commit is contained in:
Ilya Matveev
2020-04-16 14:42:21 +07:00
parent 0d9364c1dd
commit 87159b5428
2 changed files with 4 additions and 4 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/NewMultiplatformIT.kt
+3 -3
View File
@@ -2556,10 +2556,10 @@ class NewMultiplatformIT : BaseGradleIT() {
} }
val interopManifest = getManifest("foo/build/classes/kotlin/linux/main/foo-cinterop-bar.klib") val interopManifest = getManifest("foo/build/classes/kotlin/linux/main/foo-cinterop-bar.klib")
assertEquals("org.sample.one.foo-cinterop-bar", interopManifest[KLIB_PROPERTY_UNIQUE_NAME]) assertEquals("org.sample.one:foo-cinterop-bar", interopManifest[KLIB_PROPERTY_UNIQUE_NAME])
val nativeManifest = getManifest("foo/build/classes/kotlin/linux/main/foo.klib") val nativeManifest = getManifest("foo/build/classes/kotlin/linux/main/foo.klib")
assertEquals("org.sample.one.foo", nativeManifest[KLIB_PROPERTY_UNIQUE_NAME]) assertEquals("org.sample.one:foo", nativeManifest[KLIB_PROPERTY_UNIQUE_NAME])
// Check the short name that is used as a prefix in generated ObjC headers. // Check the short name that is used as a prefix in generated ObjC headers.
assertEquals("foo", nativeManifest[KLIB_PROPERTY_SHORT_NAME]) assertEquals("foo", nativeManifest[KLIB_PROPERTY_SHORT_NAME])
@@ -2567,7 +2567,7 @@ class NewMultiplatformIT : BaseGradleIT() {
.inputStream().use { stream -> .inputStream().use { stream ->
Properties().apply { load(stream) } Properties().apply { load(stream) }
} }
assertEquals("org.sample.one.foo", jsManifest[KLIB_PROPERTY_UNIQUE_NAME]) assertEquals("org.sample.one:foo", jsManifest[KLIB_PROPERTY_UNIQUE_NAME])
} }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/klibUtils.kt
+1 -1
View File
@@ -8,4 +8,4 @@ package org.jetbrains.kotlin.gradle.utils
import org.gradle.api.Project import org.gradle.api.Project
internal fun Project.klibModuleName(baseName: String = project.name): String = internal fun Project.klibModuleName(baseName: String = project.name): String =
if (group.toString().isNotEmpty()) "$group.$baseName" else baseName if (group.toString().isNotEmpty()) "$group:$baseName" else baseName