Skip to content

Commit 80cda32

Browse files
committed
Update Gradle to v7.6
This closes #242 Signed-off-by: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
1 parent 99ceb83 commit 80cda32

9 files changed

Lines changed: 39 additions & 13 deletions

File tree

gradle/wrapper/gradle-wrapper.jar

818 Bytes
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
5+
networkTimeout=10000
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
818 Bytes
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
5+
networkTimeout=10000
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

sandbox/gradlew

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sandbox/gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sigstore-gradle/sigstore-gradle-sign-base-plugin/src/main/kotlin/dev/sigstore/sign/DefaultDerivedArtifactFile.kt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
package dev.sigstore.sign
1818

1919
import org.gradle.api.DefaultTask
20+
import org.gradle.api.Task
2021
import org.gradle.api.file.RegularFile
2122
import org.gradle.api.provider.Provider
2223
import org.gradle.api.publish.internal.PublicationInternal
24+
import org.gradle.api.specs.Spec
2325
import org.gradle.api.tasks.TaskProvider
2426
import java.io.File
2527

@@ -31,5 +33,17 @@ internal class DefaultDerivedArtifactFile(
3133
fileProvider.get().asFile
3234

3335
override fun shouldBePublished(): Boolean =
34-
task.get().run { enabled && onlyIf.isSatisfiedBy(this) }
36+
task.get().run { enabled && onlyIfSatisfied() }
37+
38+
/**
39+
* Gradle 7.6 changed the type of `onlyIf` from `Spec<in Task>` to `SelfDescribingSpec<in Task>`,
40+
* so we need to use reflection to support slightly older Gradle versions in runtime.
41+
* @see [NoSuchMethodError org.gradle.api.DefaultTask.getOnlyIf when trying to run plugin compiled with Gradle 7.6 with Gradle 7.5.1](https://github.com/gradle/gradle/issues/23520)
42+
*/
43+
private fun Task.onlyIfSatisfied() : Boolean {
44+
val getOnlyIf = DefaultTask::class.java.getMethod("getOnlyIf")
45+
@Suppress("UNCHECKED_CAST")
46+
val onlyIf = getOnlyIf.invoke(this) as Spec<in Task>
47+
return onlyIf.isSatisfiedBy(this)
48+
}
3549
}

0 commit comments

Comments
 (0)