Merge branch 'main' into z/k210

Author: ZacSweers

build.gradle.kts

@@ -16,16 +16,15 @@
 import com.android.build.api.dsl.Lint
 import com.google.devtools.ksp.gradle.KspTask
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import java.net.URI
-import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.dokka.gradle.DokkaExtension
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   alias(libs.plugins.kotlinJvm) apply false
   alias(libs.plugins.ksp) apply false
-  alias(libs.plugins.dokka) apply false
+  alias(libs.plugins.dokka)
   alias(libs.plugins.mavenPublish) apply false
   alias(libs.plugins.spotless)
   alias(libs.plugins.kotlinBinaryCompatibilityValidator)
@@ -44,6 +43,13 @@ apiValidation {
     )
 }
 
+dokka {
+  dokkaPublications.html {
+    outputDirectory.set(rootDir.resolve("docs/api/0.x"))
+    includes.from(project.layout.projectDirectory.file("README.md"))
+  }
+}
+
 val ktfmtVersion = libs.versions.ktfmt.get()
 
 spotless {
@@ -108,15 +114,13 @@ subprojects {
   }
   pluginManager.withPlugin("com.vanniktech.maven.publish") {
     apply(plugin = "org.jetbrains.dokka")
-    tasks.named<DokkaTask>("dokkaHtml") {
-      outputDirectory.set(rootProject.rootDir.resolve("docs/0.x"))
+    configure<DokkaExtension> {
+      dokkaPublicationDirectory.set(layout.buildDirectory.dir("dokkaDir"))
       dokkaSourceSets.configureEach {
         skipDeprecated.set(true)
-        externalDocumentationLink {
-          url.set(URI("https://square.github.io/okio/2.x/okio/").toURL())
-        }
-        externalDocumentationLink {
-          url.set(URI("https://square.github.io/moshi/1.x/moshi/").toURL())
+        externalDocumentationLinks {
+          register("okio") { url("https://square.github.io/okio/2.x/okio/") }
+          register("moshi") { url("https://square.github.io/moshi/1.x/moshi/") }
         }
       }
     }
@@ -136,3 +140,16 @@ subprojects {
     }
   }
 }
+
+dependencies {
+  dokka(projects.moshiAdapters)
+  dokka(projects.moshiImmutableAdapters)
+  dokka(projects.moshiIr.moshiCompilerPlugin)
+  dokka(projects.moshiMetadataReflect)
+  dokka(projects.moshiProguardRuleGen)
+  dokka(projects.moshiSealed.codegen)
+  dokka(projects.moshiSealed.javaSealedReflect)
+  dokka(projects.moshiSealed.metadataReflect)
+  dokka(projects.moshiSealed.reflect)
+  dokka(projects.moshiSealed.runtime)
+}

gradle.properties

@@ -44,3 +44,7 @@ ksp.version.check=false
 kotlin.compiler.suppressExperimentalICOptimizationsWarning=true
 kotlin.compiler.keepIncrementalCompilationCachesInMemory=true
 kotlin.compiler.preciseCompilationResultsBackup=true
+
+# Dokka flags
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

gradle/libs.versions.toml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [versions]
-agp = "8.6.1"
+agp = "8.7.1"
 autoService = "1.1.1"
 gjf = "1.17.0"
 incap = "1.0.0"
@@ -29,15 +29,15 @@ okhttp = "4.12.0"
 retrofit = "2.11.0"
 
 [plugins]
-dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0-Beta" }
 kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-lint = { id = "com.android.lint", version = "8.7.0-beta02" }
-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
+lint = { id = "com.android.lint", version = "8.7.1" }
+mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
 mavenShadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 moshix = { id = "dev.zacsweers.moshix", version = "0.28.0" } # Always replaced by the local plugin
-spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA2" }
+spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA3" }
 
 [libraries]
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -50,7 +50,7 @@ autoService = { module = "com.google.auto.service:auto-service-annotations", ver
 autoService-ksp = { module = "dev.zacsweers.autoservice:auto-service-ksp", version = "1.2.0" }
 autoService-processor = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
 
-guava = { module = "com.google.guava:guava", version = "33.3.0-jre" }
+guava = { module = "com.google.guava:guava", version = "33.3.1-jre" }
 
 incap = { module = "net.ltgt.gradle.incap:incap", version.ref = "incap" }
 incap-processor = { module = "net.ltgt.gradle.incap:incap-processor", version.ref = "incap" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

moshi-ir/moshi-gradle-plugin/build.gradle.kts

@@ -15,7 +15,6 @@
  */
 
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -80,8 +79,11 @@ gradlePlugin {
   }
 }
 
-tasks.named<DokkaTask>("dokkaHtml") {
-  outputDirectory.set(rootProject.file("../docs/0.x"))
+dokka {
+  dokkaPublications.html {
+    outputDirectory.set(rootDir.resolve("docs/api/0.x"))
+    includes.from(project.layout.projectDirectory.file("README.md"))
+  }
   dokkaSourceSets.configureEach { skipDeprecated.set(true) }
 }
 

moshi-ir/moshi-gradle-plugin/gradle.properties

@@ -5,6 +5,10 @@ POM_PACKAGING=jar
 # Gradle imposes its own
 kotlin.stdlib.default.dependency=false
 
+# Dokka flags
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 GROUP=dev.zacsweers.moshix
 VERSION_NAME=0.29.0-SNAPSHOT
 POM_DESCRIPTION=A Kotlin compiler plugin that generates Moshi JsonAdapter classes.

moshi-ir/moshi-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

moshi-ir/moshi-gradle-plugin/settings.gradle.kts

@@ -29,3 +29,8 @@ dependencyResolutionManagement {
     google()
   }
 }
+
+rootProject.name = "moshi-gradle-plugin"
+
+// https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:type-safe-project-accessors
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

publish.sh

@@ -3,9 +3,9 @@
 if [[ "$1" = "--local" ]]; then local=true; fi
 
 if ! [[ ${local} ]]; then
-  ./gradlew -p moshi-ir/moshi-gradle-plugin publish -x dokkaHtml --no-configuration-cache
-  ./gradlew publish -x dokkaHtml --no-configuration-cache
+  ./gradlew -p moshi-ir/moshi-gradle-plugin publish --no-configuration-cache
+  ./gradlew publish --no-configuration-cache
 else
-  ./gradlew -p moshi-ir/moshi-gradle-plugin publishToMavenLocal -x dokkaHtml
-  ./gradlew publishToMavenLocal -x dokkaHtml
+  ./gradlew -p moshi-ir/moshi-gradle-plugin publishToMavenLocal
+  ./gradlew publishToMavenLocal
 fi

settings.gradle.kts

@@ -86,3 +86,6 @@ includeBuild("moshi-ir/moshi-gradle-plugin") {
     substitute(module("dev.zacsweers.moshix:moshi-gradle-plugin")).using(project(":"))
   }
 }
+
+// https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:type-safe-project-accessors
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")