From 3454b722ddb64cb42032e4a5cf31465cdaa1dfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Tue, 4 Jul 2023 20:56:31 +0100 Subject: [PATCH 1/2] Fix test framework dependencies. > Task :extTest:test The automatic loading of test framework implementation dependencies has been deprecated. This is scheduled to be removed in Gradle 9.0. Declare the desired test framework directly on the test suite or explicitly declare the test framework implementation dependencies on the test's runtime classpath. Consult the upgrading guide for further information: https://docs.gradle.org/8.2/userguide/upgrading_version_8.html#test_framework_implementation_dependencies --- subprojects/extTest/extTest.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/subprojects/extTest/extTest.gradle b/subprojects/extTest/extTest.gradle index af9ce66c08..afc6b9ec32 100644 --- a/subprojects/extTest/extTest.gradle +++ b/subprojects/extTest/extTest.gradle @@ -16,6 +16,7 @@ dependencies { testImplementation libraries.junitJupiterApi testRuntimeOnly libraries.junitJupiterEngine testRuntimeOnly libraries.junitVintageEngine + testRuntimeOnly libraries.junitPlatformLauncher } tasks.withType(Test) { From 8250fc727901e8eaf644629b84e010f9fe49d595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Wed, 5 Jul 2023 09:31:27 +0100 Subject: [PATCH 2/2] Work around https://github.com/shipkit/shipkit-changelog/issues/103 --- build.gradle | 1 + gradle/shipkit.gradle | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 24c2294996..20f1eee21d 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ buildscript { classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0' classpath "io.github.gradle-nexus:publish-plugin:1.3.0" + // TODO check if https://github.com/shipkit/shipkit-changelog/issues/103 is fixed, and remove workaround in shipkit.gradle. classpath 'org.shipkit:shipkit-changelog:1.2.0' classpath 'org.shipkit:shipkit-auto-version:1.2.2' diff --git a/gradle/shipkit.gradle b/gradle/shipkit.gradle index add74ce6a9..1334480800 100644 --- a/gradle/shipkit.gradle +++ b/gradle/shipkit.gradle @@ -6,6 +6,10 @@ tasks.named('generateChangelog') { previousRevision = project.ext.'shipkit-auto-version.previous-tag' githubToken = System.getenv('GITHUB_TOKEN') repository = 'mockito/mockito' + // Workarounds for https://github.com/shipkit/shipkit-changelog/issues/103 + doNotTrackState("GenerateChangelogTask tracks the entire repo, which results is locking problems hashing the .gradle folder.") + // GenerateChangelogTask uses the entire repo as input, which means it needs to "depend on" all other tasks' outputs. + mustRunAfter(allprojects.collectMany { it.tasks }.grep { it.path != ":generateChangelog" && it.path != ":githubRelease" }) } tasks.named("githubRelease") {