Skip to content

Commit

Permalink
Remove workaround for Gradle 8 warning with Shipkit (#3250)
Browse files Browse the repository at this point in the history
Reverts part of #3053
  • Loading branch information
TWiStErRob committed Jan 27, 2024
1 parent 557a452 commit ff47780
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion build.gradle
Expand Up @@ -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'

Expand Down
4 changes: 0 additions & 4 deletions gradle/shipkit.gradle
Expand Up @@ -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") {
Expand Down

0 comments on commit ff47780

Please sign in to comment.