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

Ignore kotlin visibilities for classes in effectively public package kotlin.jvm.internal

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-03-24 06:26:50 +03:00
parent ce4b161df4
commit 2e87a08c8d
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt
+4 -2
View File
@@ -30,7 +30,7 @@ class RuntimePublicAPITest {
val testName = TestName()
@Test fun kotlinRuntime() {
snapshotAPIAndCompare("../../tools/runtime/target", "kotlin-runtime", "runtime-declarations.json")
snapshotAPIAndCompare("../../tools/runtime/target", "kotlin-runtime", "runtime-declarations.json", listOf("kotlin.jvm.internal"))
}
@Test fun kotlinStdlib() {
@@ -44,14 +44,16 @@ class RuntimePublicAPITest {
}
*/
private fun snapshotAPIAndCompare(basePath: String, jarPrefix: String, kotlinJvmMappingsPath: String) {
private fun snapshotAPIAndCompare(basePath: String, jarPrefix: String, kotlinJvmMappingsPath: String, publicPackages: List<String> = emptyList()) {
val base = File(basePath).absoluteFile.normalize()
val jarFile = getJarPath(base, jarPrefix)
val kotlinJvmMappingsFile = base.resolve(kotlinJvmMappingsPath)
println("Reading kotlin visibilities from $kotlinJvmMappingsFile")
val publicPackagePrefixes = publicPackages.map { it.replace('.', '/') + '/' }
val visibilities =
readKotlinVisibilities(kotlinJvmMappingsFile)
.filterKeys { name -> publicPackagePrefixes.none { name.startsWith(it) } }
println("Reading binary API from $jarFile")
val api = getBinaryAPI(JarFile(jarFile), visibilities).filterOutNonPublic()