Skip to content

Commit fa3bd64

Browse files
authored
Fix artifact sign (#173)
1 parent f4b0fcd commit fa3bd64

File tree

5 files changed

+29
-32
lines changed

5 files changed

+29
-32
lines changed

buildSrc/src/main/kotlin/Publications.kt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import org.gradle.api.artifacts.Dependency
66
import org.gradle.api.artifacts.DependencySet
77
import org.gradle.api.artifacts.ProjectDependency
88
import org.gradle.api.publish.maven.MavenPublication
9+
import org.gradle.api.tasks.SourceSet
910
import org.gradle.api.tasks.bundling.Jar
1011
import org.gradle.kotlin.dsl.get
1112
import org.gradle.kotlin.dsl.register
@@ -73,6 +74,30 @@ fun MavenPublication.addSourcesAndJavadoc(project: Project) {
7374
artifact(project.tasks["dokkaJavadocJar"])
7475
}
7576

77+
fun MavenPublication.addSourcesAndJavadoc(
78+
project: Project, sourceSet: SourceSet,
79+
name: String, artifactName: String
80+
) {
81+
val sourcesJarTask = project.tasks.register<Jar>("$name-sources-jar") {
82+
archiveBaseName.set(artifactName)
83+
archiveClassifier.set("sources")
84+
from(sourceSet.allSource)
85+
}
86+
87+
val javaDocJarTask = project.tasks.register<Jar>("$name-javadoc-jar") {
88+
archiveBaseName.set(artifactName)
89+
archiveClassifier.set("javadoc")
90+
91+
val javaDocTask = project.tasks["dokkaJavadocJar"]
92+
dependsOn(javaDocTask)
93+
94+
from(javaDocTask.outputs)
95+
}
96+
97+
artifact(sourcesJarTask.get())
98+
artifact(javaDocJarTask.get())
99+
}
100+
76101
fun MavenPublication.addEmptyArtifact(project: Project): Unit = with(project) {
77102
artifact(generateEmptyJar())
78103
artifact(generateEmptyJar("sources"))

ksmt-bitwuzla/ksmt-bitwuzla-native/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,12 @@ bitwuzlaBinaries.entries.forEach { (sourceSet, nativeConfig) ->
4848
copyArtifactsIntoJar(nativeConfig, this, "lib/$systemArch/bitwuzla")
4949
}
5050

51-
val sourcesJarTask = tasks.register<Jar>("$name-sources-jar") {
52-
archiveBaseName.set(artifactName)
53-
archiveClassifier.set("sources")
54-
from(sourceSet.allSource)
55-
}
56-
5751
publishing.publications {
5852
register<MavenPublication>("maven-$name") {
5953
artifactId = artifactName
6054

6155
artifact(jarTask.get())
62-
artifact(sourcesJarTask.get())
63-
artifact(project.tasks["dokkaJavadocJar"])
56+
addSourcesAndJavadoc(project, sourceSet, name, artifactName)
6457

6558
addKsmtPom()
6659
signKsmtPublication(project)

ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,12 @@ cvc5Binaries.entries.forEach { (sourceSet, nativeConfig) ->
5454
copyArtifactsIntoJar(nativeConfig, this, "lib/$systemArch/cvc5")
5555
}
5656

57-
val sourcesJarTask = tasks.register<Jar>("$name-sources-jar") {
58-
archiveBaseName.set(artifactName)
59-
archiveClassifier.set("sources")
60-
from(sourceSet.allSource)
61-
}
62-
6357
publishing.publications {
6458
register<MavenPublication>("maven-$name") {
6559
artifactId = artifactName
6660

6761
artifact(jarTask.get())
68-
artifact(sourcesJarTask.get())
69-
artifact(project.tasks["dokkaJavadocJar"])
62+
addSourcesAndJavadoc(project, sourceSet, name, artifactName)
7063

7164
addKsmtPom()
7265
signKsmtPublication(project)

ksmt-yices/ksmt-yices-native/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,12 @@ yicesBinaries.entries.forEach { (sourceSet, nativeConfig) ->
5252
copyArtifactsIntoJar(nativeConfig, this, "lib/$systemArch/yices")
5353
}
5454

55-
val sourcesJarTask = tasks.register<Jar>("$name-sources-jar") {
56-
archiveBaseName.set(artifactName)
57-
archiveClassifier.set("sources")
58-
from(sourceSet.allSource)
59-
}
60-
6155
publishing.publications {
6256
register<MavenPublication>("maven-$name") {
6357
artifactId = artifactName
6458

6559
artifact(jarTask.get())
66-
artifact(sourcesJarTask.get())
67-
artifact(project.tasks["dokkaJavadocJar"])
60+
addSourcesAndJavadoc(project, sourceSet, name, artifactName)
6861

6962
addKsmtPom()
7063
signKsmtPublication(project)

ksmt-z3/ksmt-z3-native/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,12 @@ z3Binaries.forEach { (sourceSet, z3BinaryTask, nativeConfig) ->
6767
}
6868
}
6969

70-
val sourcesJarTask = tasks.register<Jar>("$name-sources-jar") {
71-
archiveBaseName.set(artifactName)
72-
archiveClassifier.set("sources")
73-
from(sourceSet.allSource)
74-
}
75-
7670
publishing.publications {
7771
register<MavenPublication>("maven-$name") {
7872
artifactId = artifactName
7973

8074
artifact(jarTask.get())
81-
artifact(sourcesJarTask.get())
82-
artifact(project.tasks["dokkaJavadocJar"])
75+
addSourcesAndJavadoc(project, sourceSet, name, artifactName)
8376

8477
addKsmtPom()
8578
signKsmtPublication(project)

0 commit comments

Comments
 (0)