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

9 files changed, 27 insertions, 17 deletions

diff --git a/plugins/all-modules-page/build.gradle.kts b/plugins/all-modules-page/build.gradle.kts
index dd423949..ac38afe1 100644
--- a/plugins/all-modules-page/build.gradle.kts
+++ b/plugins/all-modules-page/build.gradle.kts
@@ -20,5 +20,6 @@ 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")
 }
\ No newline at end of file
diff --git a/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt b/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt
index 782ee16e..4285046a 100644
--- a/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt
+++ b/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt
@@ -63,7 +63,7 @@ class MultimodulePageCreator(
             header(2, "All modules:")
             table(styles = setOf(MultimoduleTable)) {
                 header { group { text("Name") } }
-                modules.filter { it.name in creationContext.nonEmptyModules }.sortedByDescending { it.name }
+                modules.filter { it.name in creationContext.nonEmptyModules }.sortedBy { it.name }
                     .forEach { module ->
                         val displayedModuleDocumentation = getDisplayedModuleDocumentation(module)
                         val dri = DRI(packageName = MULTIMODULE_PACKAGE_PLACEHOLDER, classNames = module.name)
diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts
index 3ae15b3e..122b9b92 100644
--- a/plugins/base/base-test-utils/build.gradle.kts
+++ b/plugins/base/base-test-utils/build.gradle.kts
@@ -3,7 +3,8 @@ import org.jetbrains.registerDokkaArtifactPublication
 dependencies {
     compileOnly(project(":plugins:base"))
     implementation(project(":core:test-api"))
-    implementation("org.jsoup:jsoup:1.13.1")
+    val jsoup_version: String by project
+    implementation("org.jsoup:jsoup:$jsoup_version")
     implementation(kotlin("test-junit"))
 }
 
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 1281ac3f..35bcf5cf 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -9,7 +9,8 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
 
     api(project(":kotlin-analysis"))
-    implementation("org.jsoup:jsoup:1.13.1")
+    val jsoup_version: String by project
+    implementation("org.jsoup:jsoup:$jsoup_version")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1")
     testImplementation(project(":plugins:base:base-test-utils"))
     testImplementation(project(":core:content-matcher-test-utils"))
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index 4cbce45a..5cfc3d22 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -5,7 +5,8 @@ dependencies {
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:base-test-utils"))
     testImplementation(project(":core:content-matcher-test-utils"))
-    testImplementation("org.jsoup:jsoup:1.13.1")
+    val jsoup_version: String by project
+    testImplementation("org.jsoup:jsoup:$jsoup_version")
 }
 
 registerDokkaArtifactPublication("kotlinAsJavaPlugin") {
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index 1d92c0be..50e838a8 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,7 +1,8 @@
 import org.jetbrains.registerDokkaArtifactPublication
 
 dependencies {
-    testImplementation("org.jsoup:jsoup:1.13.1")
+    val jsoup_version: String by project
+    testImplementation("org.jsoup:jsoup:$jsoup_version")
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:base-test-utils"))
     testImplementation(project(":core:content-matcher-test-utils"))
diff --git a/plugins/templating/build.gradle.kts b/plugins/templating/build.gradle.kts
index f62944fd..c28dd2c4 100644
--- a/plugins/templating/build.gradle.kts
+++ b/plugins/templating/build.gradle.kts
@@ -13,6 +13,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")
     testImplementation(project(":plugins:base:base-test-utils"))
 }
\ No newline at end of file
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))
+                            }
                         }
                     }
-                }
             }
         }
     }