Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update plugin com.diffplug.spotless to v6.19.0 #229

Merged
merged 3 commits into from
Jun 5, 2023
Merged

chore(deps): update plugin com.diffplug.spotless to v6.19.0 #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a5784a
chore(deps): update plugin com.diffplug.spotless to v6.19.0
renovate[bot] Jun 1, 2023
044862f
gradlew :spotlessApply
TWiStErRob Jun 3, 2023
1731aea
> Task :spotlessKotlin FAILED
TWiStErRob Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 8 additions & 2 deletions src/e2eTest/kotlin/io/github/gradlenexus/publishplugin/e2e/NexusPublishE2ETests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/io/github/gradlenexus/publishplugin/internal/NexusClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Description>):
Call<Dto<CreatedStagingRepository>>
fun startStagingRepo(@Path("stagingProfileId") stagingProfileId: String, @Body description: Dto<Description>): Call<Dto<CreatedStagingRepository>>

@Headers("Content-Type: application/json")
@POST("staging/bulk/close")
Expand Down