Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable Dokka #2597

Merged
merged 1 commit into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
dependencies {
classpath(libs.pluginz.kotlin)
classpath(libs.vanniktechPublishPlugin)
classpath(libs.dokka.core)
classpath(libs.dokka.gradlePlugin)
// classpath(libs.dokka.core)
// classpath(libs.dokka.gradlePlugin)
classpath(libs.pluginz.buildConfig)
classpath(libs.pluginz.spotless)
classpath(libs.pluginz.kotlinSerialization)
Expand Down
34 changes: 17 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
import org.gradle.api.tasks.testing.logging.TestLogEvent.STARTED
import org.jetbrains.dokka.gradle.DokkaTask
// import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

buildscript {
dependencies {
classpath(libs.dokka.core)
classpath(libs.dokka.gradlePlugin)
// classpath(libs.dokka.core)
// classpath(libs.dokka.gradlePlugin)
classpath(libs.pluginz.android)
classpath(libs.pluginz.binaryCompatibilityValidator)
classpath(libs.pluginz.kotlin)
Expand Down Expand Up @@ -165,20 +165,20 @@ allprojects {
}
}

tasks.withType<DokkaTask>().configureEach {
dokkaSourceSets.configureEach {
reportUndocumented.set(false)
skipDeprecated.set(true)
jdkVersion.set(8)
perPackageOption {
matchingRegex.set("com\\.squareup\\.wire\\.internal.*")
suppress.set(true)
}
}
if (name == "dokkaGfm") {
outputDirectory.set(project.file("${project.rootDir}/docs/3.x"))
}
}
// tasks.withType<DokkaTask>().configureEach {
// dokkaSourceSets.configureEach {
// reportUndocumented.set(false)
// skipDeprecated.set(true)
// jdkVersion.set(8)
// perPackageOption {
// matchingRegex.set("com\\.squareup\\.wire\\.internal.*")
// suppress.set(true)
// }
// }
// if (name == "dokkaGfm") {
// outputDirectory.set(project.file("${project.rootDir}/docs/3.x"))
// }
// }

plugins.withId("com.vanniktech.maven.publish.base") {
configure<PublishingExtension> {
Expand Down
9 changes: 5 additions & 4 deletions wire-compiler/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
application
kotlin("jvm")
id("org.jetbrains.kotlin.plugin.serialization")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.github.johnrengelman.shadow").apply(false)
id("com.vanniktech.maven.publish.base").apply(false)
}
Expand Down Expand Up @@ -45,7 +46,7 @@ if (project.rootProject.name == "wire") {

configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
}
7 changes: 4 additions & 3 deletions wire-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.gradle.publish.PluginBundleExtension
import com.vanniktech.maven.publish.GradlePlugin
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.MavenPublishBaseExtension
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
Expand All @@ -16,7 +16,8 @@ plugins {
id("com.github.gmazzo.buildconfig")
id("java-gradle-plugin")
id("com.gradle.plugin-publish").version("0.18.0").apply(false)
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -87,7 +88,7 @@ val test by tasks.getting(Test::class) {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
GradlePlugin(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
GradlePlugin(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
Expand Down
7 changes: 4 additions & 3 deletions wire-grpc-client/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("multiplatform")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -91,7 +92,7 @@ repositories.whenObjectAdded {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinMultiplatform(javadocJar = Dokka("dokkaGfm"))
KotlinMultiplatform(javadocJar = Javadoc())
)
}
}
7 changes: 4 additions & 3 deletions wire-grpc-server-generator/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
id("java-library")
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -39,7 +40,7 @@ sourceSets {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
7 changes: 4 additions & 3 deletions wire-grpc-server/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
id("java-library")
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -37,7 +38,7 @@ sourceSets {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
7 changes: 4 additions & 3 deletions wire-gson-support/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand All @@ -15,7 +16,7 @@ if (project.rootProject.name == "wire") {

configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
Expand Down
7 changes: 4 additions & 3 deletions wire-java-generator/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
id("java-library")
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand All @@ -31,7 +32,7 @@ dependencies {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
7 changes: 4 additions & 3 deletions wire-kotlin-generator/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
id("java-library")
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand All @@ -30,7 +31,7 @@ dependencies {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
7 changes: 4 additions & 3 deletions wire-moshi-adapter/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand All @@ -15,7 +16,7 @@ if (project.rootProject.name == "wire") {

configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
Expand Down
7 changes: 4 additions & 3 deletions wire-reflector/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
id("java-library")
kotlin("jvm")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand All @@ -15,7 +16,7 @@ if (project.rootProject.name == "wire") {

configure<MavenPublishBaseExtension> {
configure(
KotlinJvm(javadocJar = Dokka("dokkaGfm"), sourcesJar = true)
KotlinJvm(javadocJar = Javadoc(), sourcesJar = true)
)
}
}
Expand Down
7 changes: 4 additions & 3 deletions wire-runtime/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("multiplatform")
id("com.github.gmazzo.buildconfig")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -156,7 +157,7 @@ buildConfig {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinMultiplatform(javadocJar = Dokka("dokkaGfm"))
KotlinMultiplatform(javadocJar = Javadoc())
)
}

Expand Down
7 changes: 4 additions & 3 deletions wire-schema-tests/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("multiplatform")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -68,7 +69,7 @@ kotlin {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinMultiplatform(javadocJar = Dokka("dokkaGfm"))
KotlinMultiplatform(javadocJar = Javadoc())
)
}
}
7 changes: 4 additions & 3 deletions wire-schema/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavadocJar.Dokka
import com.vanniktech.maven.publish.JavadocJar.Javadoc
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.MavenPublishBaseExtension

plugins {
kotlin("multiplatform")
id("org.jetbrains.dokka")
// TODO(Benoit) Re-enable dokka when it works again. Probably related to https://github.com/Kotlin/dokka/issues/2977
// id("org.jetbrains.dokka")
id("com.vanniktech.maven.publish.base").apply(false)
}

Expand Down Expand Up @@ -74,7 +75,7 @@ kotlin {
if (project.rootProject.name == "wire") {
configure<MavenPublishBaseExtension> {
configure(
KotlinMultiplatform(javadocJar = Dokka("dokkaGfm"))
KotlinMultiplatform(javadocJar = Javadoc())
)
}

Expand Down
Loading