Fix Dokka version in coroutines and serialization tests

dokka-integration-tests/gradle/projects/coroutines/coroutines.diff

@@ -1,25 +1,36 @@
 diff --git a/build.gradle b/build.gradle
-index e7d405e12..0ca2169fe 100644
+index e7d405e12..236310823 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -107,6 +107,9 @@ allprojects {
+@@ -59,8 +59,9 @@ buildscript {
+     }
+
+     dependencies {
++        def dokkaVersion = System.getenv('DOKKA_VERSION')
+         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
++        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
+         classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
+         classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
+         classpath "com.github.node-gradle:gradle-node-plugin:$gradle_node_version"
+@@ -107,6 +108,9 @@ allprojects {
              mavenLocal()
          }
      }
 +    repositories {
 +        mavenLocal()
 +    }
-
+ 
      ext.unpublished = unpublished
-
-@@ -142,6 +145,7 @@ allprojects {
+ 
+@@ -142,6 +146,7 @@ allprojects {
          google()
          mavenCentral()
          CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project)
 +        mavenLocal()
      }
  }
-
+ 
 diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
 index ae54ad0f6..4655940a9 100644
 --- a/buildSrc/build.gradle.kts
@@ -30,7 +41,7 @@ index ae54ad0f6..4655940a9 100644
      }
 +    mavenLocal()
  }
-
+ 
  val gradleProperties = Properties().apply {
 diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
 index c2e859f65..43dc4f749 100644
@@ -44,15 +55,15 @@ index c2e859f65..43dc4f749 100644
      }
  }
 diff --git a/gradle.properties b/gradle.properties
-index 3d9431be0..b60114bc2 100644
+index 3d9431be0..d77aa3b07 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -14,7 +14,7 @@ atomicfu_version=0.21.0
  knit_version=0.5.0-Beta
  html_version=0.7.2
  lincheck_version=2.18.1
 -dokka_version=1.8.10
-+dokka_version=non-existing-sanity-check
++dokka_version=non-existing-sanity-check-SNAPSHOT
  byte_buddy_version=1.10.9
  reactor_version=3.4.1
  reactive_streams_version=1.0.3
@@ -67,4 +78,4 @@ index 151c087fd..e578bdb93 100644
 +        mavenLocal()
      }
  }
-
+ 

dokka-integration-tests/gradle/projects/serialization/serialization.diff

@@ -1,13 +1,29 @@
+diff --git a/build.gradle b/build.gradle
+index 73b566ae..c7224a7a 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -76,9 +76,10 @@ buildscript {
+     }
+
+     dependencies {
++        def dokkaVersion = System.getenv('DOKKA_VERSION')
+         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
++        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
+         classpath "org.jetbrains.kotlinx:kover:$kover_version"
+         classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$validator_version"
+         classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
 diff --git a/gradle.properties b/gradle.properties
-index 5ef66cd9..51a90924 100644
+index 5ef66cd9..7e7323fd 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -13,7 +13,7 @@ kotlin.version.snapshot=1.9.255-SNAPSHOT
-
+ 
  junit_version=4.12
  jackson_version=2.10.0.pr1
 -dokka_version=1.8.10
-+dokka_version=1.9.20-SNAPSHOT
++dokka_version=non-existing-sanity-check-SNAPSHOT
  native.deploy=
  validator_version=0.13.2
  knit_version=0.5.0-Beta

dokka-integration-tests/gradle/projects/template.root.gradle.kts

@@ -22,6 +22,7 @@ allprojects {
 afterEvaluate {
     logger.quiet("Gradle version: ${gradle.gradleVersion}")
     logger.quiet("Kotlin version: ${properties["dokka_it_kotlin_version"]}")
+    logger.quiet("Dokka version: ${properties["dokka_it_dokka_version"]}")
     properties["dokka_it_android_gradle_plugin_version"]?.let { androidVersion ->
         logger.quiet("Android version: $androidVersion")
     }

dokka-integration-tests/gradle/projects/template.settings.gradle.kts

@@ -6,13 +6,15 @@
 
 pluginManagement {
     val dokka_it_kotlin_version: String by settings
+    val dokka_it_dokka_version: String by settings
     val dokka_it_android_gradle_plugin_version: String? by settings
 
     plugins {
         id("org.jetbrains.kotlin.js") version dokka_it_kotlin_version
         id("org.jetbrains.kotlin.jvm") version dokka_it_kotlin_version
         id("org.jetbrains.kotlin.android") version dokka_it_kotlin_version
         id("org.jetbrains.kotlin.multiplatform") version dokka_it_kotlin_version
+        id("org.jetbrains.dokka") version dokka_it_dokka_version
     }
 
     resolutionStrategy {

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt

@@ -36,6 +36,7 @@ public abstract class AbstractGradleIntegrationTest : AbstractIntegrationTest()
             .withTestKitDir(File("build", "gradle-test-kit").absoluteFile)
             .withArguments(
                 listOfNotNull(
+                    "-Pdokka_it_dokka_version=${System.getenv("DOKKA_VERSION")}",
                     "-Pdokka_it_kotlin_version=${buildVersions.kotlinVersion}",
                     buildVersions.androidGradlePluginVersion?.let { androidVersion ->
                         "-Pdokka_it_android_gradle_plugin_version=$androidVersion"

gradle.properties

@@ -9,7 +9,6 @@ version=1.9.20-SNAPSHOT
 org.jetbrains.dokka.javaToolchain.mainCompiler=8
 org.jetbrains.dokka.javaToolchain.testLauncher=8
 org.jetbrains.dokka.kotlinLanguageLevel=1.4
-dokka_integration_test_parallelism=2
 
 # Code style
 kotlin.code.style=official