diff --git a/build.gradle.kts b/build.gradle.kts index 2661ed3c..0e24fb8f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { id("com.gradle.plugin-publish") version "1.2.0" // From 6.14.0 onwards Spotless requires Gradle to be on Java 11, // but we still use Java 8 in .github/workflows/java-versions.yml. - id("com.diffplug.spotless") version "6.13.0" + id("com.diffplug.spotless") version "6.19.0" id("com.github.johnrengelman.shadow") version "8.1.1" id("org.jetbrains.gradle.plugin.idea-ext") id("com.github.ben-manes.versions") version "0.46.0" diff --git a/src/e2eTest/kotlin/io/github/gradlenexus/publishplugin/e2e/NexusPublishE2ETests.kt b/src/e2eTest/kotlin/io/github/gradlenexus/publishplugin/e2e/NexusPublishE2ETests.kt index 83a5d569..3e816201 100644 --- a/src/e2eTest/kotlin/io/github/gradlenexus/publishplugin/e2e/NexusPublishE2ETests.kt +++ b/src/e2eTest/kotlin/io/github/gradlenexus/publishplugin/e2e/NexusPublishE2ETests.kt @@ -51,8 +51,14 @@ class NexusPublishE2ETests : BaseGradleTest() { } @ParameterizedTest(name = "{0}") - // nexus-publish-e2e-multi-project disabled due to: https://github.com/gradle-nexus/publish-plugin/issues/200 - @ValueSource(strings = ["nexus-publish-e2e-minimal", "nexus-publish-e2e-minimal-ivy"/*, "nexus-publish-e2e-multi-project"*/]) + @ValueSource( + strings = [ + "nexus-publish-e2e-minimal", + "nexus-publish-e2e-minimal-ivy" + // Disabled due to: https://github.com/gradle-nexus/publish-plugin/issues/200. + // "nexus-publish-e2e-multi-project" + ] + ) fun `release project to real Sonatype Nexus in two executions`(projectName: String) { File("src/e2eTest/resources/$projectName").copyRecursively(projectDir) // Even though published e2e package is effectively dropped, Sonatype Nexus rules requires unique versions - https://issues.sonatype.org/browse/OSSRH-86532 diff --git a/src/main/kotlin/io/github/gradlenexus/publishplugin/internal/NexusClient.kt b/src/main/kotlin/io/github/gradlenexus/publishplugin/internal/NexusClient.kt index a28bf674..817462ac 100644 --- a/src/main/kotlin/io/github/gradlenexus/publishplugin/internal/NexusClient.kt +++ b/src/main/kotlin/io/github/gradlenexus/publishplugin/internal/NexusClient.kt @@ -190,8 +190,7 @@ open class NexusClient(private val baseUrl: URI, username: String?, password: St @Headers("Content-Type: application/json") @POST("staging/profiles/{stagingProfileId}/start") - fun startStagingRepo(@Path("stagingProfileId") stagingProfileId: String, @Body description: Dto): - Call> + fun startStagingRepo(@Path("stagingProfileId") stagingProfileId: String, @Body description: Dto): Call> @Headers("Content-Type: application/json") @POST("staging/bulk/close")