[ABI Validation] Minor improvements

* Use the correct path delimiter in error messages * Make Project.sourceSets helper internal and migrate from deprecated convention Pull request Kotlin/binary-compatibility-validator#101
JetBrains · Dec 13, 2024 · 8010563 · 8010563
1 parent 56902c5
commit 8010563
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libraries/tools/abi-validation/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt b/libraries/tools/abi-validation/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
@@ -203,8 +203,8 @@ private fun Project.configureKotlinCompilation(
     configureCheckTasks(apiBuildDir, apiBuild, extension, targetConfig, commonApiDump, commonApiCheck)
 }
 
-val Project.sourceSets: SourceSetContainer
-    get() = convention.getPlugin(JavaPluginConvention::class.java).sourceSets
+internal val Project.sourceSets: SourceSetContainer
+    get() = extensions.getByName("sourceSets") as SourceSetContainer
 
 internal val Project.apiValidationExtensionOrNull: ApiValidationExtension?
     get() =

diff --git a/libraries/tools/abi-validation/src/main/kotlin/KotlinApiCompareTask.kt b/libraries/tools/abi-validation/src/main/kotlin/KotlinApiCompareTask.kt
@@ -91,7 +91,7 @@ open class KotlinApiCompareTask @Inject constructor(private val objects: ObjectF
 
         var expectedApiDeclaration = apiBuildDirFiles.keys.single()
         if (expectedApiDeclaration !in expectedApiFiles) {
-            error("File ${expectedApiDeclaration.lastName} is missing from ${projectApiDir.relativePath()}, please run " +
+            error("File ${expectedApiDeclaration.lastName} is missing from ${projectApiDir.relativeDirPath()}, please run " +
                     ":$subject:apiDump task to generate one")
         }
         // Normalize case-sensitivity
@@ -108,8 +108,8 @@ open class KotlinApiCompareTask @Inject constructor(private val objects: ObjectF
         }
     }
 
-    private fun File.relativePath(): String {
-        return relativeTo(rootDir).toString() + "/"
+    private fun File.relativeDirPath(): String {
+        return toRelativeString(rootDir) + File.separator
     }
 
     private fun compareFiles(checkFile: File, builtFile: File): String? {