Skip to content

Commit 9de28ad

Browse files
authored
fix(scalatest): resolve issues with crossbuild signing (via #1111)
1 parent 7948193 commit 9de28ad

File tree

1 file changed

+45
-32
lines changed

1 file changed

+45
-32
lines changed

allure-scalatest/build.gradle.kts

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.gradle.jvm.tasks.Jar
2-
31
description = "Allure ScalaTest Integration"
42

53
plugins {
@@ -24,50 +22,63 @@ crossBuild {
2422
}
2523
}
2624

27-
val crossBuildScala_212Jar by tasks.getting
28-
val crossBuildScala_213Jar by tasks.getting
29-
30-
val scaladocJar by tasks.creating(Jar::class) {
31-
from(tasks.getByName("scaladoc"))
32-
archiveClassifier.set("scaladoc")
25+
tasks.publishMavenPublicationToMavenLocal {
26+
enabled = false
3327
}
34-
35-
tasks.withType<PublishToMavenLocal>().configureEach {
36-
val predicate = provider {
37-
publication != publishing.publications["maven"]
38-
}
39-
onlyIf("disable default maven publication") {
40-
predicate.get()
41-
}
28+
tasks.publishMavenPublicationToSonatypeRepository {
29+
enabled = false
4230
}
43-
44-
tasks.withType<PublishToMavenRepository>().configureEach {
45-
val predicate = provider {
46-
publication != publishing.publications["maven"]
47-
}
48-
onlyIf("disable default maven publication") {
49-
predicate.get()
50-
}
31+
tasks.signMavenPublication {
32+
enabled = false
33+
}
34+
tasks.sourcesJar {
35+
enabled = false
5136
}
5237

5338
publishing {
5439
publications {
5540
create<MavenPublication>("crossBuildScala_212") {
5641
from(components["crossBuildScala_212"])
57-
artifact(scaladocJar)
58-
artifact(tasks.sourcesJar)
42+
43+
val crossBuildScala_212SourcesJar by tasks.creating(Jar::class) {
44+
from(sourceSets["crossBuildScala_212"].allSource)
45+
archiveBaseName.set("allure-scalatest_$scala212")
46+
archiveClassifier.set("sources")
47+
}
48+
artifact(crossBuildScala_212SourcesJar)
49+
50+
val crossBuildScala_212ScaladocJar by tasks.creating(Jar::class) {
51+
from(tasks.scaladoc)
52+
archiveBaseName.set("allure-scalatest_$scala212")
53+
archiveClassifier.set("scaladoc")
54+
}
55+
artifact(crossBuildScala_212ScaladocJar)
5956
}
6057
create<MavenPublication>("crossBuildScala_213") {
6158
from(components["crossBuildScala_213"])
62-
artifact(scaladocJar)
63-
artifact(tasks.sourcesJar)
59+
60+
val crossBuildScala_213SourcesJar by tasks.creating(Jar::class) {
61+
from(sourceSets["crossBuildScala_213"].allSource)
62+
archiveBaseName.set("allure-scalatest_$scala213")
63+
archiveClassifier.set("sources")
64+
}
65+
artifact(crossBuildScala_213SourcesJar)
66+
67+
val crossBuildScala_213ScaladocJar by tasks.creating(Jar::class) {
68+
from(tasks.scaladoc)
69+
archiveBaseName.set("allure-scalatest_$scala213")
70+
archiveClassifier.set("scaladoc")
71+
}
72+
artifact(crossBuildScala_213ScaladocJar)
6473
}
6574
}
6675
}
6776

6877
signing {
69-
sign(publishing.publications["crossBuildScala_212"])
70-
sign(publishing.publications["crossBuildScala_213"])
78+
sign(
79+
publishing.publications["crossBuildScala_212"],
80+
publishing.publications["crossBuildScala_213"]
81+
)
7182
}
7283

7384
dependencies {
@@ -88,9 +99,11 @@ dependencies {
8899

89100
tasks.jar {
90101
manifest {
91-
attributes(mapOf(
102+
attributes(
103+
mapOf(
92104
"Automatic-Module-Name" to "io.qameta.allure.scalatest"
93-
))
105+
)
106+
)
94107
}
95108
}
96109

0 commit comments

Comments
 (0)