Update compare task after rebase on dev branch

Author: fzhinkin

api/binary-compatibility-validator.api

@@ -82,7 +82,7 @@ public class kotlinx/validation/KotlinApiBuildTask : kotlinx/validation/BuildTas
 }
 
 public class kotlinx/validation/KotlinApiCompareTask : org/gradle/api/DefaultTask {
-	public fun <init> ()V
+	public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
 	public final fun getGeneratedApiFile ()Lorg/gradle/api/file/RegularFileProperty;
 	public final fun getProjectApiFile ()Lorg/gradle/api/file/RegularFileProperty;
 }

src/main/kotlin/KotlinApiCompareTask.kt

@@ -15,7 +15,7 @@ import org.gradle.api.model.ObjectFactory
 import org.gradle.api.tasks.*
 
 @CacheableTask
-public open class KotlinApiCompareTask @Inject constructor(private val objects: ObjectFactory): DefaultTask() {
+public open class KotlinApiCompareTask @Inject constructor(objects: ObjectFactory): DefaultTask() {
 
     @get:InputFiles
     @get:SkipWhenEmpty
@@ -33,122 +33,31 @@ public open class KotlinApiCompareTask @Inject constructor(private val objects:
 
     @TaskAction
     internal fun verify() {
-        val projectApiDir = projectApiFile.get().asFile.parentFile
-        if (!projectApiDir.exists()) {
-            error("Expected folder with API declarations '$projectApiDir' does not exist.\n" +
-                    "Please ensure that ':apiDump' was executed in order to get API dump to compare the build against")
-        }
-        val buildApiDir = generatedApiFile.get().asFile.parentFile
-        if (!buildApiDir.exists()) {
-            error("Expected folder with generate API declarations '$buildApiDir' does not exist.")
-        }
-        val subject = projectName
+        val projectApiFile = projectApiFile.get().asFile
+        val generatedApiFile = generatedApiFile.get().asFile
 
-        if (!projectApiFile.get().asFile.exists()) {
-            error("File ${projectApiFile.get().asFile.name} is missing from ${projectApiDir.relativeDirPath()}, please run " +
-                    ":$subject:apiDump task to generate one")
-        }
-        if (!generatedApiFile.get().asFile.exists()) {
-            error("File ${generatedApiFile.get().asFile.name} is missing from dump results.")
-        }
-
-        // Normalize case-sensitivity
-        val diffSet = mutableSetOf<String>()
-        val diff = compareFiles(projectApiFile.get().asFile, generatedApiFile.get().asFile)
-        if (diff != null) diffSet.add(diff)
-        if (diffSet.isNotEmpty()) {
-            val diffText = diffSet.joinToString("\n\n")
-            error("API check failed for project $subject.\n$diffText\n\n You can run :$subject:apiDump task to overwrite API declarations")
-        }
-    }
-
-    private fun File.relativeDirPath(): String {
-        return toRelativeString(rootDir) + File.separator
-    }
-
-    private fun compareFiles(checkFile: File, builtFile: File): String? {
-        val checkText = checkFile.readText()
-        val builtText = builtFile.readText()
-
-        // We don't compare full text because newlines on Windows & Linux/macOS are different
-        val checkLines = checkText.lines()
-        val builtLines = builtText.lines()
-        if (checkLines == builtLines)
-            return null
-
-        val patch = DiffUtils.diff(checkLines, builtLines)
-        val diff = UnifiedDiffUtils.generateUnifiedDiff(checkFile.toString(), builtFile.toString(), checkLines, patch, 3)
-        return diff.joinToString("\n")
-    }
-}
-
-// TODO: decide what to do with to old compare task
-internal abstract class KotlinApiCompareLazyTask @Inject constructor(private val objects: ObjectFactory): DefaultTask() {
-
-    @get:SkipWhenEmpty
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    public val projectApiFile: RegularFileProperty = objects.fileProperty()
-
-    @get:InputFiles
-    @get:SkipWhenEmpty
-    public val generatedApiFile: RegularFileProperty = objects.fileProperty()
-
-    private val projectName = project.name
-
-    private val rootDir = project.rootProject.rootDir
-
-    @TaskAction
-    internal fun verify() {
-        val projectApiFile_ = projectApiFile.get().asFile
-        val projectApiDir = projectApiFile_.parentFile
+        val projectApiDir = projectApiFile.parentFile
         if (!projectApiDir.exists()) {
             error("Expected folder with API declarations '$projectApiDir' does not exist.\n" +
                     "Please ensure that ':apiDump' was executed in order to get API dump to compare the build against")
         }
-        val generatedApiFile_ = generatedApiFile.get().asFile
-        val buildApiDir = generatedApiFile_.parentFile
+        val buildApiDir = generatedApiFile.parentFile
         if (!buildApiDir.exists()) {
             error("Expected folder with generate API declarations '$buildApiDir' does not exist.")
         }
         val subject = projectName
 
-        /*
-         * We use case-insensitive comparison to workaround issues with case-insensitive OSes
-         * and Gradle behaving slightly different on different platforms.
-         * We neither know original sensitivity of existing .api files, not
-         * build ones, because projectName that is part of the path can have any sensitvity.
-         * To workaround that, we replace paths we are looking for the same paths that
-         * actually exist on FS.
-         */
-        fun caseInsensitiveMap() = TreeMap<String, RelativePath> { rp, rp2 ->
-            rp.compareTo(rp2, true)
-        }
-
-        val apiBuildDirFiles = caseInsensitiveMap()
-        val expectedApiFiles = caseInsensitiveMap()
-
-        objects.fileTree().from(buildApiDir).visit { file ->
-            apiBuildDirFiles[file.name] = file.relativePath
-        }
-        objects.fileTree().from(projectApiDir).visit { file ->
-            expectedApiFiles[file.name] = file.relativePath
-        }
-
-        if (!expectedApiFiles.containsKey(projectApiFile_.name)) {
-            error("File ${projectApiFile_.name} is missing from ${projectApiDir.relativeDirPath()}, please run " +
+        if (!projectApiFile.exists()) {
+            error("File ${projectApiFile.name} is missing from ${projectApiDir.relativeDirPath()}, please run " +
                     ":$subject:apiDump task to generate one")
         }
-        if (!apiBuildDirFiles.containsKey(generatedApiFile_.name)) {
-            error("File ${generatedApiFile_.name} is missing from dump results.")
+        if (!generatedApiFile.exists()) {
+            error("File ${generatedApiFile.name} is missing from dump results.")
         }
 
         // Normalize case-sensitivity
-        val expectedApiDeclaration = expectedApiFiles.getValue(projectApiFile_.name)
-        val actualApiDeclaration = apiBuildDirFiles.getValue(generatedApiFile_.name)
         val diffSet = mutableSetOf<String>()
-        val expectedFile = expectedApiDeclaration.getFile(projectApiDir)
-        val actualFile = actualApiDeclaration.getFile(buildApiDir)
-        val diff = compareFiles(expectedFile, actualFile)
+        val diff = compareFiles(projectApiFile, generatedApiFile)
         if (diff != null) diffSet.add(diff)
         if (diffSet.isNotEmpty()) {
             val diffText = diffSet.joinToString("\n\n")