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

binary-compatibility-validator: use project version to disambiguate artifacts

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-05-03 22:20:29 +03:00
parent ab70307cc0
commit 180233b78e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/binary-compatibility-validator/build.gradle
+2 -1
View File
@@ -37,6 +37,7 @@ test {
dependsOn cleanCompileTestKotlin dependsOn cleanCompileTestKotlin
dependsOn configurations.testArtifacts dependsOn configurations.testArtifacts
systemProperties['overwrite.output'] = System.getProperty("overwrite.output", "false") systemProperty 'overwrite.output', System.getProperty("overwrite.output", "false")
systemProperty 'kotlinVersion', project.version
jvmArgs '-ea' jvmArgs '-ea'
} }
libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt
+7 -6
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2017 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ class RuntimePublicAPITest {
private fun snapshotAPIAndCompare(basePath: String, jarPattern: String, kotlinJvmMappingsPath: List<String>, publicPackages: List<String> = emptyList(), nonPublicPackages: List<String> = emptyList()) { private fun snapshotAPIAndCompare(basePath: String, jarPattern: String, kotlinJvmMappingsPath: List<String>, publicPackages: List<String> = emptyList(), nonPublicPackages: List<String> = emptyList()) {
val base = File(basePath).absoluteFile.normalize() val base = File(basePath).absoluteFile.normalize()
val jarFile = getJarPath(base, jarPattern) val jarFile = getJarPath(base, jarPattern, System.getProperty("kotlinVersion"))
val kotlinJvmMappingsFiles = kotlinJvmMappingsPath.map(base::resolve) val kotlinJvmMappingsFiles = kotlinJvmMappingsPath.map(base::resolve)
println("Reading kotlin visibilities from $kotlinJvmMappingsFiles") println("Reading kotlin visibilities from $kotlinJvmMappingsFiles")
@@ -75,15 +75,16 @@ class RuntimePublicAPITest {
api.dumpAndCompareWith(target) api.dumpAndCompareWith(target)
} }
private fun getJarPath(base: File, jarPattern: String): File { private fun getJarPath(base: File, jarPattern: String, kotlinVersion: String?): File {
val regex = Regex("$jarPattern.+\\.jar") val versionPattern = kotlinVersion?.let { "-" + Regex.escape(it) } ?: ".+"
val regex = Regex(jarPattern + versionPattern + "\\.jar")
val files = (base.listFiles() ?: throw Exception("Cannot list files in $base")) val files = (base.listFiles() ?: throw Exception("Cannot list files in $base"))
.filter { it.name.let { .filter { it.name.let {
it matches regex it matches regex
&& !it.endsWith("-sources.jar") && !it.endsWith("-sources.jar")
&& !it.endsWith("-javadoc.jar") }} && !it.endsWith("-javadoc.jar") } }
return files.singleOrNull() ?: throw Exception("No single file matching $jarPattern in $base: $files") return files.singleOrNull() ?: throw Exception("No single file matching $regex in $base:\n${files.joinToString("\n")}")
} }
} }