From 8596058063fdcefc788d1a471de61e83e8eed35c Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 20 Oct 2022 15:14:51 +0200
Subject: [PATCH 1/2] Use correct path delimiter in error message

---
 src/main/kotlin/KotlinApiCompareTask.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/KotlinApiCompareTask.kt b/src/main/kotlin/KotlinApiCompareTask.kt
index 6ca711e6..66f242fd 100644
--- a/src/main/kotlin/KotlinApiCompareTask.kt
+++ b/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? {

From 4231e59bf82d27af341a047196cd0dc14a7bca47 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 20 Oct 2022 15:18:43 +0200
Subject: [PATCH 2/2] Make Project.sourceSets helper internal and migrate from
 deprecated convention

---
 src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt b/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
index 71803002..b0a7841f 100644
--- a/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
+++ b/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() =