From e77349cb89c966c4434f93177f8f38cc66139ef1 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 28 Jan 2026 16:09:59 -0500 Subject: [PATCH 1/2] Don't disable javadoc publishing --- moshi-adapters/build.gradle.kts | 6 ------ moshi-kotlin-codegen/build.gradle.kts | 5 ----- moshi-kotlin/build.gradle.kts | 6 ------ moshi/build.gradle.kts | 6 ------ 4 files changed, 23 deletions(-) diff --git a/moshi-adapters/build.gradle.kts b/moshi-adapters/build.gradle.kts index 59c2d8397..8dffa5327 100644 --- a/moshi-adapters/build.gradle.kts +++ b/moshi-adapters/build.gradle.kts @@ -1,8 +1,4 @@ -import com.vanniktech.maven.publish.JavadocJar.None -import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.configure plugins { kotlin("jvm") @@ -21,5 +17,3 @@ dependencies { tasks.withType().configureEach { manifest { attributes("Automatic-Module-Name" to "com.squareup.moshi.adapters") } } - -configure { configure(KotlinJvm(javadocJar = None())) } diff --git a/moshi-kotlin-codegen/build.gradle.kts b/moshi-kotlin-codegen/build.gradle.kts index 6b7bf1b5d..cab66cb06 100644 --- a/moshi-kotlin-codegen/build.gradle.kts +++ b/moshi-kotlin-codegen/build.gradle.kts @@ -1,6 +1,3 @@ -import com.vanniktech.maven.publish.JavadocJar.None -import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -53,5 +50,3 @@ dependencies { testImplementation(libs.truth) testImplementation(libs.kotlinCompileTesting) } - -configure { configure(KotlinJvm(javadocJar = None())) } diff --git a/moshi-kotlin/build.gradle.kts b/moshi-kotlin/build.gradle.kts index b55b831fa..2e4c3922d 100644 --- a/moshi-kotlin/build.gradle.kts +++ b/moshi-kotlin/build.gradle.kts @@ -1,8 +1,4 @@ -import com.vanniktech.maven.publish.JavadocJar.None -import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.configure plugins { kotlin("jvm") @@ -22,5 +18,3 @@ dependencies { tasks.withType().configureEach { manifest { attributes("Automatic-Module-Name" to "com.squareup.moshi.kotlin") } } - -configure { configure(KotlinJvm(javadocJar = None())) } diff --git a/moshi/build.gradle.kts b/moshi/build.gradle.kts index e0d2aa7e8..008961751 100644 --- a/moshi/build.gradle.kts +++ b/moshi/build.gradle.kts @@ -1,8 +1,4 @@ -import com.vanniktech.maven.publish.JavadocJar.None -import com.vanniktech.maven.publish.KotlinJvm -import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.configure import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME @@ -65,5 +61,3 @@ dependencies { tasks.withType().configureEach { manifest { attributes("Automatic-Module-Name" to "com.squareup.moshi") } } - -configure { configure(KotlinJvm(javadocJar = None())) } From 975b7f8a2a847a21f3bcbb3d3dd17ffa429320bb Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 28 Jan 2026 16:10:54 -0500 Subject: [PATCH 2/2] Add deployment wait till publish --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba19070ee..96783c3df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: distribution: 'zulu' java-version-file: .github/workflows/.java-version - uses: gradle/actions/setup-gradle@v5 - - run: ./gradlew publish dokkaGenerate + - run: ./gradlew publish dokkaGenerate -PmavenCentralDeploymentValidation=PUBLISHED env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}