Skip to content

Commit 6873958

Browse files
committed
Bump gradle 8
Signed-off-by: Vladimir Sitnikov <[email protected]>
1 parent 785acfb commit 6873958

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
55
networkTimeout=10000
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

sigstore-gradle/sigstore-gradle-sign-base-plugin/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@ dependencies {
1515
testImplementation(project(":sigstore-testkit"))
1616
}
1717

18-
pluginBundle {
19-
website = "https://github.com/sigstore/sigstore-java"
20-
vcsUrl = "https://github.com/sigstore/sigstore-java.git"
21-
tags = listOf("sigstore", "sign")
22-
}
23-
2418
gradlePlugin {
19+
website.set("https://github.com/sigstore/sigstore-java")
20+
vcsUrl.set("https://github.com/sigstore/sigstore-java.git")
2521
plugins {
2622
named("dev.sigstore.sign-base") {
2723
displayName = "Base tasks and configurations for signing artifacts via Sigstore"
2824
description = "The plugin provides tasks and configurations so you can wire your own Sigstore signing. " +
2925
"If you want sign everything with standard configuration, then consider dev.sigstore.sign plugin instead"
26+
tags.set(listOf("sigstore", "sign"))
3027
}
3128
}
3229
}

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,22 @@ import org.gradle.api.provider.Provider
2323
import org.gradle.api.publish.internal.PublicationInternal
2424
import org.gradle.api.specs.Spec
2525
import org.gradle.api.tasks.TaskProvider
26+
import org.gradle.internal.Factory
2627
import java.io.File
2728

2829
internal class DefaultDerivedArtifactFile(
2930
val task: TaskProvider<DefaultTask>,
3031
val fileProvider: Provider<RegularFile>,
31-
) : PublicationInternal.DerivedArtifact {
32+
) : PublicationInternal.DerivedArtifact, Factory<File> {
33+
34+
// Gradle expects create(): Object method as well, otherwise it throws the following error.
35+
// We workaround it by adding "implements Factory<File>", so Java bytecode has a bridge method
36+
// Caused by: java.lang.AbstractMethodError: Receiver class dev.sigstore.sign.DefaultDerivedArtifactFile does not define or inherit an implementation of the resolved method 'abstract java.lang.Object create()' of interface org.gradle.internal.Factory.
37+
// at org.gradle.api.publish.maven.internal.artifact.DerivedMavenArtifact.getFile(DerivedMavenArtifact.java:37)
38+
// at dev.sigstore.sign.SigstoreSignExtension$sign$3.execute(SigstoreSignExtension.kt:84)
39+
// at dev.sigstore.sign.SigstoreSignExtension$sign$3.execute(SigstoreSignExtension.kt:82)
40+
// at org.gradle.internal.Actions$FilteredAction.execute(Actions.java:243)
41+
// at org.gradle.internal.ImmutableActionSet$SingletonSet.execute(ImmutableAction
3242
override fun create(): File =
3343
fileProvider.get().asFile
3444

sigstore-gradle/sigstore-gradle-sign-plugin/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@ dependencies {
1515
testImplementation(project(":sigstore-testkit"))
1616
}
1717

18-
pluginBundle {
19-
website = "https://github.com/sigstore/sigstore-java"
20-
vcsUrl = "https://github.com/sigstore/sigstore-java.git"
21-
tags = listOf("sigstore", "sign")
22-
}
23-
2418
gradlePlugin {
19+
website.set("https://github.com/sigstore/sigstore-java")
20+
vcsUrl.set("https://github.com/sigstore/sigstore-java.git")
2521
plugins {
2622
named("dev.sigstore.sign") {
2723
displayName = "Sign artifacts via Sigstore"
2824
description = "The plugin signs all artifacts with Sigstore and attaches signature bundles"
25+
tags.set(listOf("sigstore", "sign"))
2926
}
3027
}
3128
}

0 commit comments

Comments
 (0)