Merge branch 'master' into adam/feat/KT-70336/custom-plugin-config-ex…

…ample

.gitattributes

@@ -42,6 +42,8 @@ docs-developer/**                                                   linguist-doc
 examples/**                                                         linguist-documentation
 dokka-integration-tests/gradle/projects/**                          linguist-documentation
 
+# exclude test data
+dokka-integration-tests/gradle/projects/**/expectedData/**                                linguist-generated
 dokka-integration-tests/gradle/src/testExampleProjects/expectedData/**                    linguist-generated
 dokka-runners/dokka-gradle-plugin/src/testFunctional/resources/KotlinDslAccessorsTest/**  linguist-generated
 

build.gradle.kts

@@ -115,12 +115,15 @@ idea {
                 ".idea",
                 ".husky",
                 ".kotlin",
+                "dokka-integration-tests/.kotlin",
                 "dokka-runners/dokka-gradle-plugin/.kotlin",
                 "dokka-runners/runner-cli/.kotlin",
                 "dokka-runners/runner-maven-plugin/.kotlin",
                 "dokka-runners/dokka-gradle-plugin/src/testFunctional/resources/KotlinDslAccessorsTest/",
 
                 "dokka-integration-tests/gradle/src/testExampleProjects/expectedData",
+                "dokka-integration-tests/gradle/projects/it-android/expectedData",
+                "dokka-integration-tests/gradle/projects/it-android-compose/expectedData",
             )
         )
     }

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

@@ -26,7 +26,7 @@ dependencies {
     api(libs.kotlin.test)
     api(libs.junit.jupiterApi)
     api(libs.junit.jupiterParams)
-
+    api(libs.kotest.assertionsCore)
     api(gradleTestKit())
 
     api(testFixtures("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"))
@@ -177,6 +177,32 @@ fun registerTestProjectSuite(
     }
 }
 
+testing.suites.named<JvmTestSuite>("test") {
+    targets.configureEach {
+        testTask {
+            systemProperty
+                .inputDirectory("templateProjectsDir", templateProjectsDir)
+                .withPathSensitivity(RELATIVE)
+
+            // Don't register ANDROID_HOME as a Task input, because the path is different on everyone's machine,
+            // which means Gradle will never be able to cache the task.
+            dokkaBuild.androidSdkDir.orNull?.let { androidSdkDir ->
+                environment("ANDROID_HOME", androidSdkDir)
+            }
+
+            // Use a stable Java version for running Gradle in integration tests.
+            // There's no need to parameterise the version, to re-run the tests with different JDKs.
+            // There are a few reasons for this:
+            // - Some tests use AGP 8, which requires Gradle 17+.
+            // - DGP functional tests are already run with Java 8, so we don't need to re-test Java 8 compatibility here.
+            // - The JDK used to run Gradle doesn't affect the Dokka output. The Java Toolchain used to compile
+            //   the code in test projects does affect the output... but that can be parameterised in the
+            //   individual tests if necessary.
+            javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) }
+        }
+    }
+}
+
 val checkoutKotlinxCoroutines by tasks.registering(GitCheckoutTask::class) {
     uri = "https://github.com/Kotlin/kotlinx.coroutines.git"
     commitId = "b78bbf518bd8e90e9ed2133ebdacc36441210cd6"
@@ -194,6 +220,9 @@ testing {
         targets.configureEach {
             testTask.configure {
                 devMavenPublish.configureTask(this)
+
+                // temp workaround, remove when all `testTemplateProject*` source sets are removed
+                mustRunAfter(tasks.withType<GitCheckoutTask>())
             }
         }
     }

dokka-integration-tests/gradle/projects/it-android-compose/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+
+    if ("/* %{KGP_VERSION} */".startsWith("2.")) {
+        id("org.jetbrains.kotlin.plugin.compose") version "/* %{KGP_VERSION} */" apply false
+    }
+    alias(libs.plugins.compose.multiplatform) apply false
+
+    id("org.jetbrains.dokka") version "/* %{DGP_VERSION} */"
+}
+
+dependencies {
+    dokka(project(":core"))
+    dokka(project(":material3"))
+}

dokka-integration-tests/gradle/projects/it-android-compose/core/build.gradle.kts

@@ -0,0 +1,45 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.multiplatform)
+    id("org.jetbrains.dokka")
+
+    if ("/* %{KGP_VERSION} */".startsWith("2.")) {
+        id("org.jetbrains.kotlin.plugin.compose")
+    }
+    alias(libs.plugins.compose.multiplatform)
+}
+
+group = "org.dokka.it.android.kmp"
+version = "1.0"
+
+android {
+    namespace = "org.dokka.it.android.kmp"
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
+
+    androidTarget {
+        publishLibraryVariants("release")
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(compose.runtime)
+                implementation(compose.foundation)
+                implementation(compose.animation)
+            }
+        }
+    }
+}

dokka-integration-tests/gradle/projects/it-android-compose/core/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />

dokka-integration-tests/gradle/projects/it-android-compose/core/src/commonMain/kotlin/MenuItem.kt

@@ -0,0 +1,12 @@
+package org.dokka.it.android.kmp.core
+
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.graphics.vector.ImageVector
+
+@Stable
+public data class MenuItem(
+    val label: String,
+    val imageVector: ImageVector,
+    val onClick: () -> Unit,
+    val isImportant: Boolean,
+)