Don't use older dir from previous runs in versioning (#1963)

2 files changed, 14 insertions, 10 deletions

diff --git a/plugins/versioning/build.gradle.kts b/plugins/versioning/build.gradle.kts
index 54249b90..776eea95 100644
--- a/plugins/versioning/build.gradle.kts
+++ b/plugins/versioning/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
     val kotlinx_html_version: String by project
     implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
 
-    implementation("org.jsoup:jsoup:1.13.1")
+    val jsoup_version: String by project
+    implementation("org.jsoup:jsoup:$jsoup_version")
     implementation("org.apache.maven:maven-artifact:3.6.3")
 }
\ No newline at end of file
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))
+                            }
                         }
                     }
-                }
             }
         }
     }