Skip to content

Commit 8667092

Browse files
authored
Don't disable javadoc publishing + make release job wait (#2076)
1 parent 26c3064 commit 8667092

File tree

5 files changed

+1
-24
lines changed

5 files changed

+1
-24
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
distribution: 'zulu'
1717
java-version-file: .github/workflows/.java-version
1818
- uses: gradle/actions/setup-gradle@v5
19-
- run: ./gradlew publish dokkaGenerate
19+
- run: ./gradlew publish dokkaGenerate -PmavenCentralDeploymentValidation=PUBLISHED
2020
env:
2121
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
2222
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}

moshi-adapters/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import com.vanniktech.maven.publish.JavadocJar.None
2-
import com.vanniktech.maven.publish.KotlinJvm
3-
import com.vanniktech.maven.publish.MavenPublishBaseExtension
41
import org.gradle.jvm.tasks.Jar
5-
import org.gradle.kotlin.dsl.configure
62

73
plugins {
84
kotlin("jvm")
@@ -21,5 +17,3 @@ dependencies {
2117
tasks.withType<Jar>().configureEach {
2218
manifest { attributes("Automatic-Module-Name" to "com.squareup.moshi.adapters") }
2319
}
24-
25-
configure<MavenPublishBaseExtension> { configure(KotlinJvm(javadocJar = None())) }

moshi-kotlin-codegen/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import com.vanniktech.maven.publish.JavadocJar.None
2-
import com.vanniktech.maven.publish.KotlinJvm
3-
import com.vanniktech.maven.publish.MavenPublishBaseExtension
41
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
52

63
plugins {
@@ -53,5 +50,3 @@ dependencies {
5350
testImplementation(libs.truth)
5451
testImplementation(libs.kotlinCompileTesting)
5552
}
56-
57-
configure<MavenPublishBaseExtension> { configure(KotlinJvm(javadocJar = None())) }

moshi-kotlin/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import com.vanniktech.maven.publish.JavadocJar.None
2-
import com.vanniktech.maven.publish.KotlinJvm
3-
import com.vanniktech.maven.publish.MavenPublishBaseExtension
41
import org.gradle.jvm.tasks.Jar
5-
import org.gradle.kotlin.dsl.configure
62

73
plugins {
84
kotlin("jvm")
@@ -22,5 +18,3 @@ dependencies {
2218
tasks.withType<Jar>().configureEach {
2319
manifest { attributes("Automatic-Module-Name" to "com.squareup.moshi.kotlin") }
2420
}
25-
26-
configure<MavenPublishBaseExtension> { configure(KotlinJvm(javadocJar = None())) }

moshi/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import com.vanniktech.maven.publish.JavadocJar.None
2-
import com.vanniktech.maven.publish.KotlinJvm
3-
import com.vanniktech.maven.publish.MavenPublishBaseExtension
41
import org.gradle.jvm.tasks.Jar
5-
import org.gradle.kotlin.dsl.configure
62
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
73
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
84
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
@@ -65,5 +61,3 @@ dependencies {
6561
tasks.withType<Jar>().configureEach {
6662
manifest { attributes("Automatic-Module-Name" to "com.squareup.moshi") }
6763
}
68-
69-
configure<MavenPublishBaseExtension> { configure(KotlinJvm(javadocJar = None())) }

0 commit comments

Comments
 (0)