diff options
| -rw-r--r-- | integration-tests/gradle-integration-tests/build.gradle.kts | 1 | ||||
| -rw-r--r-- | integration-tests/gradle/projects/it-basic/settings.gradle.kts | 9 | ||||
| -rw-r--r-- | runners/gradle-plugin/build.gradle.kts | 18 |
3 files changed, 23 insertions, 5 deletions
diff --git a/integration-tests/gradle-integration-tests/build.gradle.kts b/integration-tests/gradle-integration-tests/build.gradle.kts index 4db0f976..7cb96738 100644 --- a/integration-tests/gradle-integration-tests/build.gradle.kts +++ b/integration-tests/gradle-integration-tests/build.gradle.kts @@ -40,5 +40,6 @@ tasks { test { systemProperty("android.licenses.overwrite", project.findProperty("android.licenses.overwrite") ?: "") inputs.dir(file("testData")) + exclude("*") // TODO: Remove this exclude when tests are migrated } } diff --git a/integration-tests/gradle/projects/it-basic/settings.gradle.kts b/integration-tests/gradle/projects/it-basic/settings.gradle.kts index 10447365..ca697588 100644 --- a/integration-tests/gradle/projects/it-basic/settings.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/settings.gradle.kts @@ -2,13 +2,18 @@ pluginManagement { val dokka_it_kotlin_version: String by settings - val dokka_version = "0.11.0-SNAPSHOT" plugins { id("org.jetbrains.kotlin.jvm") version dokka_it_kotlin_version - id("org.jetbrains.dokka") version dokka_version } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.jetbrains.dokka") { + useModule("org.jetbrains.dokka:dokka-gradle-plugin:for-integration-tests-SNAPSHOT") + } + } + } repositories { maven("https://dl.bintray.com/kotlin/kotlin-dev/") mavenLocal() diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts index e0241f67..917c7d7e 100644 --- a/runners/gradle-plugin/build.gradle.kts +++ b/runners/gradle-plugin/build.gradle.kts @@ -32,6 +32,12 @@ val sourceJar by tasks.registering(Jar::class) { from(sourceSets["main"].allSource) } +configureBintrayPublication("dokkaGradlePlugin") // TODO check if this publishes correctly + +val gradlePluginImplementationClass = "org.jetbrains.dokka.gradle.DokkaPlugin" + +val gradlePluginId = "org.jetbrains.dokka" + publishing { publications { register<MavenPublication>("dokkaGradlePlugin") { @@ -39,20 +45,26 @@ publishing { from(components["java"]) artifact(sourceJar.get()) } + + register<MavenPublication>("dokkaGradlePluginForIntegrationTests") { + artifactId = "dokka-gradle-plugin" + from(components["java"]) + artifact(sourceJar.get()) + version = "for-integration-tests-SNAPSHOT" + } } } -configureBintrayPublication("dokkaGradlePlugin") // TODO check if this publishes correctly - gradlePlugin { plugins { create("dokkaGradlePlugin") { id = "org.jetbrains.dokka" - implementationClass = "org.jetbrains.dokka.gradle.DokkaPlugin" + implementationClass = gradlePluginImplementationClass } } } + pluginBundle { // TODO check if this publishes correctly website = "https://www.kotlinlang.org/" |