From 178a6858ffc382f0fcba674499367007d0adb3c9 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Mon, 17 Jan 2022 13:04:35 -0500 Subject: [PATCH] Switch fully over to dokka and fix accidental root project publishing (#1507) --- build.gradle.kts | 2 +- moshi-adapters/build.gradle.kts | 4 ++-- moshi-kotlin/build.gradle.kts | 4 ++-- moshi/build.gradle.kts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 03a441e..6a0324f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ buildscript { } plugins { - alias(libs.plugins.mavenPublish) + alias(libs.plugins.mavenPublish) apply false alias(libs.plugins.dokka) apply false alias(libs.plugins.spotless) alias(libs.plugins.japicmp) apply false diff --git a/moshi-adapters/build.gradle.kts b/moshi-adapters/build.gradle.kts index 5ac3780..cecfe72 100644 --- a/moshi-adapters/build.gradle.kts +++ b/moshi-adapters/build.gradle.kts @@ -1,4 +1,4 @@ -import com.vanniktech.maven.publish.JavadocJar.Javadoc +import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.gradle.jvm.tasks.Jar @@ -24,5 +24,5 @@ tasks.withType().configureEach { } configure { - configure(KotlinJvm(javadocJar = Javadoc())) + configure(KotlinJvm(javadocJar = Dokka("dokkaGfm"))) } diff --git a/moshi-kotlin/build.gradle.kts b/moshi-kotlin/build.gradle.kts index c9aeb0a..3bf206b 100644 --- a/moshi-kotlin/build.gradle.kts +++ b/moshi-kotlin/build.gradle.kts @@ -1,4 +1,4 @@ -import com.vanniktech.maven.publish.JavadocJar.Javadoc +import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.gradle.jvm.tasks.Jar @@ -25,5 +25,5 @@ tasks.withType().configureEach { } configure { - configure(KotlinJvm(javadocJar = Javadoc())) + configure(KotlinJvm(javadocJar = Dokka("dokkaGfm"))) } diff --git a/moshi/build.gradle.kts b/moshi/build.gradle.kts index c4e1f08..b83c158 100644 --- a/moshi/build.gradle.kts +++ b/moshi/build.gradle.kts @@ -1,4 +1,4 @@ -import com.vanniktech.maven.publish.JavadocJar.Javadoc +import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.gradle.jvm.tasks.Jar @@ -91,5 +91,5 @@ tasks.withType().configureEach { } configure { - configure(KotlinJvm(javadocJar = Javadoc())) + configure(KotlinJvm(javadocJar = Dokka("dokkaGfm"))) }