Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions allure-bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ plugins {

description = "Allure Java (Bill of Materials)"

val scalaTestBinaryVersions = listOf("2.12", "2.13", "3")

dependencies {
constraints {
rootProject.subprojects.sorted()
.forEach { api("${it.group}:${it.name}:${it.version}") }
rootProject.subprojects.sorted().forEach {
if (it.name == "allure-scalatest") {
scalaTestBinaryVersions.forEach { scalaBinaryVersion ->
api("${it.group}:${it.name}_$scalaBinaryVersion:${it.version}")
}
} else {
api("${it.group}:${it.name}:${it.version}")
}
}
}
}

Expand Down
6 changes: 4 additions & 2 deletions allure-scalatest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Use this module when your ScalaTest suites should produce Allure results with su
- Allure Java 3.x requires Java 17 or newer.
- This module targets ScalaTest 3.2.x.
- The current build validates against ScalaTest 3.2.20.
- Artifacts are cross-built for Scala 2.12.21 and Scala 2.13.18.
- Artifacts are cross-built for Scala 2.12.21, Scala 2.13.18, and Scala 3.3.8 LTS.

## Installation

Expand All @@ -20,10 +20,12 @@ Gradle:
```kotlin
dependencies {
testImplementation(platform("io.qameta.allure:allure-bom:<allure-version>"))
testImplementation("io.qameta.allure:allure-scalatest_2.13")
testImplementation("io.qameta.allure:allure-scalatest_3")
}
```

Use the `_2.12` or `_2.13` artifact instead when targeting the corresponding Scala 2 binary version.

sbt:

```scala
Expand Down
28 changes: 24 additions & 4 deletions allure-scalatest/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@ plugins {

val scala212 = "2.12"
val scala213 = "2.13"
val scala3 = "3"
val scalaTestVersion = "3.2.20"

project.base.archivesName.set("allure-scalatest")

crossBuild {
scalaVersionsCatalog = mapOf(
scala212 to "2.12.21",
scala213 to "2.13.18"
scala213 to "2.13.18",
scala3 to "3.3.8"
)
builds {
register("scala") {
scalaVersions = setOf(scala212, scala213)
scalaVersions = setOf(scala212, scala213, scala3)
}
}
}
Expand Down Expand Up @@ -71,18 +74,35 @@ publishing {
}
artifact(crossBuildScala_213ScaladocJar)
}
create<MavenPublication>("crossBuildScala_3") {
from(components["crossBuildScala_3"])

val crossBuildScala_3SourcesJar by tasks.creating(Jar::class) {
from(sourceSets["crossBuildScala_3"].allSource)
archiveBaseName.set("allure-scalatest_$scala3")
archiveClassifier.set("sources")
}
artifact(crossBuildScala_3SourcesJar)

val crossBuildScala_3ScaladocJar by tasks.creating(Jar::class) {
from(tasks.scaladoc)
archiveBaseName.set("allure-scalatest_$scala3")
archiveClassifier.set("javadoc")
}
artifact(crossBuildScala_3ScaladocJar)
}
}
}

dependencies {
api(project(":allure-java-commons"))
compileOnly("org.scalatest:scalatest_$scala213:3.2.20")
compileOnly("org.scalatest:scalatest_$scala213:$scalaTestVersion")
compileOnly("org.scala-lang.modules:scala-collection-compat_$scala213:2.14.0")
testImplementation("io.github.glytching:junit-extensions")
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("org.scalatest:scalatest_$scala213:3.2.20")
testImplementation("org.scalatest:scalatest_$scala213:$scalaTestVersion")
testImplementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.14.0")
testImplementation("org.slf4j:slf4j-simple")
testImplementation(project(":allure-assertj"))
Expand Down
Loading