Remove workaround for shipkit/shipkit-changelog#103

Reverts part of mockito#3053
TWiStErRob · Jan 27, 2024 · ee7dab2 · ee7dab2
1 parent 557a452
commit ee7dab2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,6 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
 
         classpath "io.github.gradle-nexus:publish-plugin:2.0.0-rc-1"
-        // TODO check if https://github.com/shipkit/shipkit-changelog/issues/103 is fixed, and remove workaround in shipkit.gradle.
         classpath 'org.shipkit:shipkit-changelog:2.0.1'
         classpath 'org.shipkit:shipkit-auto-version:2.0.2'
 

diff --git a/gradle/shipkit.gradle b/gradle/shipkit.gradle
@@ -6,10 +6,6 @@ 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") {