From cffe72a6fe427e91d480603eb29447f2e59274f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Mon, 13 Feb 2023 14:34:12 +0000 Subject: [PATCH 1/3] Refresh Stutter Locks --- .stutter/java11.lock | 15 ++++++++------- .stutter/java17.lock | 6 ++++-- .stutter/java8.lock | 15 ++++++++------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.stutter/java11.lock b/.stutter/java11.lock index 1101040d..c0eb0bd6 100644 --- a/.stutter/java11.lock +++ b/.stutter/java11.lock @@ -1,7 +1,8 @@ -# DO NOT MODIFY: Generated by Stutter plugin. -5.0 -5.6.4 -6.0.1 -6.9.1 -7.0.2 -7.3 +# DO NOT MODIFY: Generated by Stutter plugin. +5.0 +5.6.4 +6.0.1 +6.9.3 +7.0.2 +7.6 +8.0 diff --git a/.stutter/java17.lock b/.stutter/java17.lock index 37eed97b..960c4d3b 100644 --- a/.stutter/java17.lock +++ b/.stutter/java17.lock @@ -1,2 +1,4 @@ -# DO NOT MODIFY: Generated by Stutter plugin. -7.3 +# DO NOT MODIFY: Generated by Stutter plugin. +7.3.3 +7.6 +8.0 diff --git a/.stutter/java8.lock b/.stutter/java8.lock index 1101040d..c0eb0bd6 100644 --- a/.stutter/java8.lock +++ b/.stutter/java8.lock @@ -1,7 +1,8 @@ -# DO NOT MODIFY: Generated by Stutter plugin. -5.0 -5.6.4 -6.0.1 -6.9.1 -7.0.2 -7.3 +# DO NOT MODIFY: Generated by Stutter plugin. +5.0 +5.6.4 +6.0.1 +6.9.3 +7.0.2 +7.6 +8.0 From f740026f0db00dbe2485248eb16074ec5c8bb446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Mon, 13 Feb 2023 14:34:53 +0000 Subject: [PATCH 2/3] Restore line endings --- .stutter/java11.lock | 16 ++++++++-------- .stutter/java17.lock | 8 ++++---- .stutter/java8.lock | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.stutter/java11.lock b/.stutter/java11.lock index c0eb0bd6..84cd0431 100644 --- a/.stutter/java11.lock +++ b/.stutter/java11.lock @@ -1,8 +1,8 @@ -# DO NOT MODIFY: Generated by Stutter plugin. -5.0 -5.6.4 -6.0.1 -6.9.3 -7.0.2 -7.6 -8.0 +# DO NOT MODIFY: Generated by Stutter plugin. +5.0 +5.6.4 +6.0.1 +6.9.3 +7.0.2 +7.6 +8.0 diff --git a/.stutter/java17.lock b/.stutter/java17.lock index 960c4d3b..94e2ee56 100644 --- a/.stutter/java17.lock +++ b/.stutter/java17.lock @@ -1,4 +1,4 @@ -# DO NOT MODIFY: Generated by Stutter plugin. -7.3.3 -7.6 -8.0 +# DO NOT MODIFY: Generated by Stutter plugin. +7.3.3 +7.6 +8.0 diff --git a/.stutter/java8.lock b/.stutter/java8.lock index c0eb0bd6..84cd0431 100644 --- a/.stutter/java8.lock +++ b/.stutter/java8.lock @@ -1,8 +1,8 @@ -# DO NOT MODIFY: Generated by Stutter plugin. -5.0 -5.6.4 -6.0.1 -6.9.3 -7.0.2 -7.6 -8.0 +# DO NOT MODIFY: Generated by Stutter plugin. +5.0 +5.6.4 +6.0.1 +6.9.3 +7.0.2 +7.6 +8.0 From 67270a7968518471e9554e7918cca808e6b77a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 16 Feb 2023 09:17:03 +0000 Subject: [PATCH 3/3] Ignore warnings for now --- .../publishplugin/NexusPublishPluginTests.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/compatTest/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPluginTests.kt b/src/compatTest/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPluginTests.kt index a3263456..375cb997 100644 --- a/src/compatTest/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPluginTests.kt +++ b/src/compatTest/kotlin/io/github/gradlenexus/publishplugin/NexusPublishPluginTests.kt @@ -949,10 +949,19 @@ class NexusPublishPluginTests { gradleRunner(*arguments).buildAndFail() private fun gradleRunner(vararg arguments: String): GradleRunner { + val warnings = when { + // There's a deprecation in Gradle 7.6 that doesn't allow for passing builds. + // See https://github.com/gradle-nexus/publish-plugin/issues/152 for more details. + // This conditional branch of when should be removed once that issue is fixed. + gradleVersion >= GradleVersion.version("7.6") -> "all" + // Failing only became an option at Gradle 5.6. + gradleVersion >= GradleVersion.version("5.6") -> "fail" + else -> "all" + } return gradleRunner // .withDebug(true) .withProjectDir(projectDir.toFile()) - .withArguments(*arguments, "--stacktrace", "--warning-mode=${if (gradleVersion >= GradleVersion.version("5.6")) "fail" else "all"}") + .withArguments(*arguments, "--stacktrace", "--warning-mode=$warnings") .forwardOutput() }