Gradle integration tests: Use dokka_it_kotlin_version over kotlin_version

1 files changed, 12 insertions, 8 deletions

diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt b/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
index 5bd35415..d5fd3e78 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
@@ -7,13 +7,17 @@ import org.gradle.kotlin.dsl.provideDelegate
 fun Project.configureDokkaVersion(): String {
     var dokka_version: String? by this.extra
     if (dokka_version == null) {
-        val buildNumber = System.getenv("BUILD_NUMBER")
         val dokka_version_base: String by this
-        dokka_version = dokka_version_base + if (buildNumber == null || System.getenv("FORCE_SNAPSHOT") != null) {
-            "-SNAPSHOT"
-        } else {
-            "-$buildNumber"
-        }
+        dokka_version = dokkaVersionFromBase(dokka_version_base)
     }
-    return dokka_version!!
-}
\ No newline at end of file
+    return checkNotNull(dokka_version)
+}
+
+private fun dokkaVersionFromBase(baseVersion: String): String {
+    val buildNumber = System.getenv("BUILD_NUMBER")
+    val forceSnapshot = System.getenv("FORCE_SNAPSHOT") != null
+    if (forceSnapshot || buildNumber == null) {
+        return "$baseVersion-SNAPSHOT"
+    }
+    return "$baseVersion-$buildNumber"
+}