From 2832b9a111ba3af0212cbc180e8b1535b8359a15 Mon Sep 17 00:00:00 2001
From: Marcin Aman <marcin.aman@gmail.com>
Date: Mon, 21 Jun 2021 11:44:55 +0200
Subject: Don't use older dir from previous runs in versioning (#1963)

---
 .../src/main/kotlin/versioning/VersioningHandler.kt | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'plugins/versioning/src')

diff --git a/plugins/versioning/src/main/kotlin/versioning/VersioningHandler.kt b/plugins/versioning/src/main/kotlin/versioning/VersioningHandler.kt
index 41700282..da7ebdc1 100644
--- a/plugins/versioning/src/main/kotlin/versioning/VersioningHandler.kt
+++ b/plugins/versioning/src/main/kotlin/versioning/VersioningHandler.kt
@@ -73,19 +73,22 @@ class DefaultVersioningHandler(val context: DokkaContext) : VersioningHandler {
 
     private fun copyVersion(version: VersionId, versionRoot: File, output: File) {
         val targetParent = output.resolve(OLDER_VERSIONS_DIR).resolve(version).apply { mkdirs() }
+        val olderDirs = versionRoot.resolve(OLDER_VERSIONS_DIR)
         runBlocking(Dispatchers.Default) {
             coroutineScope {
-                versionRoot.listFiles().orEmpty().forEach { versionRootContent ->
-                    launch {
-                        if (versionRootContent.isDirectory) versionRootContent.copyRecursively(
-                            targetParent.resolve(versionRootContent.name),
-                            overwrite = true
-                        )
-                        else processingStrategies.first {
-                            it.process(versionRootContent, targetParent.resolve(versionRootContent.name))
+                versionRoot.listFiles().orEmpty()
+                    .filter { it.absolutePath != olderDirs.absolutePath }
+                    .forEach { versionRootContent ->
+                        launch {
+                            if (versionRootContent.isDirectory) versionRootContent.copyRecursively(
+                                targetParent.resolve(versionRootContent.name),
+                                overwrite = true
+                            )
+                            else processingStrategies.first {
+                                it.process(versionRootContent, targetParent.resolve(versionRootContent.name))
+                            }
                         }
                     }
-                }
             }
         }
     }
-- 
cgit