Update integration tests for kotlinx libraries and add new ones (#4107)

Author: vmishenev

dokka-integration-tests/gradle/build.gradle.kts

@@ -110,6 +110,37 @@ registerTestProjectSuite("testTemplateProjectTasksExecutionStress", "it-sequenti
 registerTestProjectSuite("testTemplateProjectWasmBasic", "it-wasm-basic")
 registerTestProjectSuite("testTemplateProjectWasmJsWasiBasic", "it-wasm-js-wasi-basic")
 
+registerTestProjectSuite(
+    "testExternalProjectKotlinxIo",
+    "io/kotlinx-io",
+    jvm = JavaLanguageVersion.of(8)
+) {
+    targets.configureEach {
+        testTask.configure {
+            dependsOn(checkoutKotlinxIo)
+            // register the whole directory as an input because it contains the git diff
+            inputs
+                .dir(templateProjectsDir.file("io"))
+                .withPropertyName("ioProjectDir")
+        }
+    }
+}
+
+registerTestProjectSuite(
+    "testExternalProjectKotlinxDatetime",
+    "datetime/kotlinx-datetime",
+    jvm = JavaLanguageVersion.of(8)
+) {
+    targets.configureEach {
+        testTask.configure {
+            dependsOn(checkoutKotlinxDatetime)
+            // register the whole directory as an input because it contains the git diff
+            inputs
+                .dir(templateProjectsDir.file("datetime"))
+                .withPropertyName("datetimeProjectDir")
+        }
+    }
+}
 registerTestProjectSuite(
     "testExternalProjectKotlinxCoroutines",
     "coroutines/kotlinx-coroutines",
@@ -203,15 +234,25 @@ testing.suites.named<JvmTestSuite>("test") {
     }
 }
 
+val checkoutKotlinxDatetime by tasks.registering(GitCheckoutTask::class) {
+    uri = "https://github.com/Kotlin/kotlinx-datetime.git"
+    commitId = "4dadf6fbe4956a1a846cab0dc9282cfef1aeac23"
+    destination = templateProjectsDir.dir("datetime/kotlinx-datetime")
+}
+val checkoutKotlinxIo by tasks.registering(GitCheckoutTask::class) {
+    uri = "https://github.com/Kotlin/kotlinx-io.git"
+    commitId = "8950a88f0d00ca2d23ad39db423a97840eea9dc2"
+    destination = templateProjectsDir.dir("io/kotlinx-io")
+}
 val checkoutKotlinxCoroutines by tasks.registering(GitCheckoutTask::class) {
     uri = "https://github.com/Kotlin/kotlinx.coroutines.git"
-    commitId = "b78bbf518bd8e90e9ed2133ebdacc36441210cd6"
+    commitId = "f4f519b36734238ec686dfaec1e174086691781e"
     destination = templateProjectsDir.dir("coroutines/kotlinx-coroutines")
 }
 
 val checkoutKotlinxSerialization by tasks.registering(GitCheckoutTask::class) {
     uri = "https://github.com/Kotlin/kotlinx.serialization.git"
-    commitId = "ed1b05707ec27f8864c8b42235b299bdb5e0015c"
+    commitId = "4667a1891a925dc9e3e10490c274a875b0be4da6"
     destination = templateProjectsDir.dir("serialization/kotlinx-serialization")
 }
 

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

@@ -1,103 +1,75 @@
-diff --git a/build.gradle b/build.gradle
-index e7d405e12..db5dcec66 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -52,17 +52,27 @@ buildscript {
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 7b9248ca4..db61bb7b2 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -5,15 +5,16 @@ import org.gradle.kotlin.dsl.*
+ buildscript {
+     if (shouldUseLocalMaven(rootProject)) {
+         repositories {
+-            mavenLocal()
++            // mavenLocal()
+         }
      }
 
      repositories {
 +        /* %{DOKKA_IT_MAVEN_REPO}% */
          mavenCentral()
-         maven { url "https://plugins.gradle.org/m2/" }
-         CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project)
+         maven(url = "https://plugins.gradle.org/m2/")
+         addDevRepositoryIfEnabled(this, project)
 -        mavenLocal()
-+        //mavenLocal()
++        // mavenLocal()
      }
 
      dependencies {
-         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:${providers.gradleProperty("dokka_it_dokka_version").get()}"
-         classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
--        classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
-+        classpath("org.jetbrains.kotlinx:kotlinx-knit:$knit_version") {
-+            exclude(group: "org.jetbrains.kotlinx", module: "dokka-pathsaver-plugin")
+@@ -21,8 +22,16 @@ buildscript {
+         // The corresponding issue in kotlinx-atomicfu: https://github.com/Kotlin/kotlinx-atomicfu/issues/384
+         classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${version("atomicfu")}")
+         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${version("kotlin")}")
+-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:${version("dokka")}")
+-        classpath("org.jetbrains.kotlinx:kotlinx-knit:${version("knit")}")
++        classpath("org.jetbrains.dokka:dokka-gradle-plugin:${providers.gradleProperty("dokka_it_dokka_version").get()}")
++        classpath("org.jetbrains.kotlinx:kotlinx-knit:${version("knit")}") {
++            exclude("org.jetbrains.kotlinx", "dokka-pathsaver-plugin")
 +        }
-+        classpath("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") {
-+            exclude(group: "org.jetbrains.dokka", module: "templating-plugin")
-+            exclude(group: "org.jetbrains.dokka", module: "dokka-base")
++        classpath("org.jetbrains.kotlinx:dokka-pathsaver-plugin:${version("knit")}") {
++            exclude("org.jetbrains.dokka", "templating-plugin")
++            exclude("org.jetbrains.dokka", "dokka-base")
 +        }
 +        classpath("org.jetbrains.dokka:templating-plugin:${providers.gradleProperty("dokka_it_dokka_version").get()}")
 +        classpath("org.jetbrains.dokka:dokka-base:${providers.gradleProperty("dokka_it_dokka_version").get()}")
-+
-         classpath "com.github.node-gradle:gradle-node-plugin:$gradle_node_version"
-         classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$binary_compatibility_validator_version"
-         classpath "ru.vyarus:gradle-animalsniffer-plugin:1.5.4" // Android API check
-@@ -102,11 +112,11 @@ allprojects {
-         kotlin_version = rootProject.properties['kotlin_snapshot_version']
-     }
+         classpath("org.jetbrains.kotlinx:binary-compatibility-validator:${version("binary_compatibility_validator")}")
+         classpath("ru.vyarus:gradle-animalsniffer-plugin:${version("animalsniffer")}") // Android API check
+         classpath("org.jetbrains.kotlin:atomicfu:${version("kotlin")}")
+@@ -48,7 +57,7 @@ allprojects {
 
--    if (using_snapshot_version) {
--        repositories {
+     if (shouldUseLocalMaven(rootProject)) {
+         repositories {
 -            mavenLocal()
--        }
--    }
-+    //if (using_snapshot_version) {
-+    //    repositories {
-+    //        mavenLocal()
-+    //    }
-+    //}
-
-     ext.unpublished = unpublished
++            // mavenLocal()
+         }
+     }
 
-@@ -135,6 +145,7 @@ apiValidation {
+@@ -84,6 +93,7 @@ apiValidation {
  // Configure repositories
  allprojects {
      repositories {
 +        /* %{DOKKA_IT_MAVEN_REPO}% */
          /*
           * google should be first in the repository list because some of the play services
           * transitive dependencies was removed from jcenter, thus breaking gradle dependency resolution
-@@ -323,7 +334,12 @@ knit {
- knitPrepare.dependsOn getTasksByName("dokkaHtmlMultiModule", true)
-
- dependencies {
--    dokkaHtmlMultiModulePlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
-+    dokkaHtmlMultiModulePlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") {
-+        exclude(group: "org.jetbrains.dokka", module: "templating-plugin")
-+        exclude(group: "org.jetbrains.dokka", module: "dokka-base")
-+    }
-+    dokkaHtmlMultiModulePlugin("org.jetbrains.dokka:templating-plugin:${providers.gradleProperty("dokka_it_dokka_version").get()}")
-+    dokkaHtmlMultiModulePlugin("org.jetbrains.dokka:dokka-base:${providers.gradleProperty("dokka_it_dokka_version").get()}")
- }
-
- // Opt-in for build scan in order to troubleshoot Gradle on TC
 diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
-index ae54ad0f6..00963f5b2 100644
+index 27b713684..e92c4d725 100644
 --- a/buildSrc/build.gradle.kts
 +++ b/buildSrc/build.gradle.kts
-@@ -13,6 +13,7 @@ val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoole
+@@ -9,6 +9,7 @@ val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoole
  val kotlinDevUrl = project.rootProject.properties["kotlin_repo_url"] as? String
 
  repositories {
 +    /* %{DOKKA_IT_MAVEN_REPO}% */
      mavenCentral()
      if (cacheRedirectorEnabled) {
          maven("https://cache-redirector.jetbrains.com/plugins.gradle.org/m2")
-@@ -22,9 +23,9 @@ repositories {
-     if (!kotlinDevUrl.isNullOrEmpty()) {
-         maven(kotlinDevUrl)
-     }
--    if (buildSnapshotTrain) {
--        mavenLocal()
--    }
-+    //if (buildSnapshotTrain) {
-+    //    mavenLocal()
-+    //}
- }
-
- val gradleProperties = Properties().apply {
-@@ -49,12 +50,12 @@ dependencies {
+@@ -45,12 +46,12 @@ dependencies {
       * our version of Gradle bundles Kotlin 1.4.x and can read metadata only up to 1.5.x,
       * thus we're excluding stdlib compiled with 1.6.0 from dependencies.
       */
@@ -112,73 +84,93 @@ index ae54ad0f6..00963f5b2 100644
          exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
          exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk7")
          exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+@@ -64,6 +65,9 @@ dependencies {
+         exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+     }
+     implementation("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:${version("benchmarks")}")
+-    implementation("org.jetbrains.kotlinx:kotlinx-knit:${version("knit")}")
++    implementation("org.jetbrains.kotlinx:kotlinx-knit:${version("knit")}") {
++        exclude("org.jetbrains.dokka", "templating-plugin")
++        exclude("org.jetbrains.dokka", "dokka-base")
++    }
+     implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${version("atomicfu")}")
+ }
 diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
-index c2e859f65..9cc749a1f 100644
+index 2ad2ddbea..98eb05e0f 100644
 --- a/buildSrc/settings.gradle.kts
 +++ b/buildSrc/settings.gradle.kts
-@@ -4,6 +4,7 @@
+@@ -1,6 +1,7 @@
  pluginManagement {
      val build_snapshot_train: String? by settings
      repositories {
 +        /* %{DOKKA_IT_MAVEN_REPO}% */
          val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true
          if (cacheRedirectorEnabled) {
              println("Redirecting repositories for buildSrc buildscript")
-@@ -11,8 +12,8 @@ pluginManagement {
-         } else {
+@@ -9,7 +10,7 @@ pluginManagement {
              maven("https://plugins.gradle.org/m2")
          }
--        if (build_snapshot_train?.toBoolean() == true) {
+         if (build_snapshot_train?.toBoolean() == true) {
 -            mavenLocal()
--        }
-+        //if (build_snapshot_train?.toBoolean() == true) {
-+        //    mavenLocal()
-+        //}
++            // mavenLocal()
+         }
+     }
+ }
+diff --git a/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts b/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts
+index 966aa98e0..98f131768 100644
+--- a/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts
++++ b/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts
+@@ -25,14 +25,25 @@ tasks.withType<DokkaMultiModuleTask>().named("dokkaHtmlMultiModule") {
+
+ dependencies {
+     // Add explicit dependency between Dokka and Knit plugin
+-    add("dokkaHtmlMultiModulePlugin", "org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
++    add("dokkaHtmlMultiModulePlugin", "org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") {
++        exclude("org.jetbrains.dokka", "templating-plugin")
++        exclude("org.jetbrains.dokka", "dokka-base")
++    }
++    add("dokkaHtmlMultiModulePlugin", "org.jetbrains.dokka:templating-plugin:${providers.gradleProperty("dokka_it_dokka_version").get()}")
++    add("dokkaHtmlMultiModulePlugin", "org.jetbrains.dokka:dokka-base:${providers.gradleProperty("dokka_it_dokka_version").get()}")
+ }
+
+ // Dependencies for Knit processing: Knit plugin to work with Dokka
+ private fun Project.configurePathsaver() {
+     tasks.withType(DokkaTaskPartial::class).configureEach {
+         dependencies {
+-            plugins("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
++            val knit_version: String by project
++            plugins("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") {
++                exclude(group = "org.jetbrains.dokka", module = "templating-plugin")
++                exclude(group = "org.jetbrains.dokka", module = "dokka-base")
++            }
++            plugins("org.jetbrains.dokka:templating-plugin:${providers.gradleProperty("dokka_it_dokka_version").get()}")
++            plugins("org.jetbrains.dokka:dokka-base:${providers.gradleProperty("dokka_it_dokka_version").get()}")
+         }
      }
  }
 diff --git a/gradle.properties b/gradle.properties
-index 3d9431be0..9af01ef86 100644
+index 7af5770c3..aa5f53f9b 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
+@@ -12,7 +12,7 @@ junit_version=4.12
+ junit5_version=5.7.0
+ knit_version=0.5.0
  lincheck_version=2.18.1
--dokka_version=1.8.10
+-dokka_version=2.0.0
 +dokka_version=non-existing-sanity-check-SNAPSHOT
  byte_buddy_version=1.10.9
  reactor_version=3.4.1
- reactive_streams_version=1.0.3
-diff --git a/gradle/dokka.gradle.kts b/gradle/dokka.gradle.kts
-index ba6956aa8..4a5d27e1a 100644
---- a/gradle/dokka.gradle.kts
-+++ b/gradle/dokka.gradle.kts
-@@ -21,7 +21,13 @@ fun GradleDokkaSourceSetBuilder.makeLinkMapping(projectDir: File) {
- val knit_version: String by project
- tasks.withType(DokkaTaskPartial::class).configureEach {
-     dependencies {
--        plugins("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
-+        val knit_version: String by project
-+        plugins("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version") {
-+            exclude(group = "org.jetbrains.dokka", module = "templating-plugin")
-+            exclude(group = "org.jetbrains.dokka", module = "dokka-base")
-+        }
-+        plugins("org.jetbrains.dokka:templating-plugin:${providers.gradleProperty("dokka_it_dokka_version").get()}")
-+        plugins("org.jetbrains.dokka:dokka-base:${providers.gradleProperty("dokka_it_dokka_version").get()}")
-     }
- }
-
-diff --git a/settings.gradle b/settings.gradle
-index 151c087fd..e4433c24f 100644
---- a/settings.gradle
-+++ b/settings.gradle
-@@ -9,7 +9,8 @@ pluginManagement {
+ reactor_docs_version=3.4.5
+diff --git a/settings.gradle.kts b/settings.gradle.kts
+index 423c613f3..7bcebfa6d 100644
+--- a/settings.gradle.kts
++++ b/settings.gradle.kts
+@@ -6,7 +6,7 @@ pluginManagement {
      }
 
      repositories {
--        maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
-+        /* %{DOKKA_IT_MAVEN_REPO}% */
-+        //maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
+-        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
++        //maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
          gradlePluginPortal()
      }
  }

dokka-integration-tests/gradle/projects/datetime/.gitignore

@@ -0,0 +1,2 @@
+# kotlinx-datetime is automatically downloaded with a Gradle task
+kotlinx-datetime/