Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump default Allure version from 2.13.6 to 2.19.0, AspectJ from 1.9.5 to 1.9.9.1 #99

Merged
merged 1 commit into from
Sep 15, 2022
Merged

Bump default Allure version from 2.13.6 to 2.19.0, AspectJ from 1.9.5 to 1.9.9.1 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,15 @@ provide Allure results.
Data collecting is implemented via `io.qameta.allure-adapter` Gradle plugin.

The values in the sample below are the defaults.
The sample uses Kotlin DSL. In Groovy DSL you could use `allureJavaVersion = "2.13.9"`, however, that is the only difference.
The sample uses Kotlin DSL. In Groovy DSL you could use `allureJavaVersion = "2.19.0"`, however, that is the only difference.

```kotlin
allure {
version.set("2.19.0")
adapter {
// Configure version for io.qameta.allure:allure-* adapters
allureJavaVersion.set("2.13.9")
// It defaults to allure.version
allureJavaVersion.set("2.19.0")
aspectjVersion.set("1.9.5")

autoconfigure.set(true)
Expand Down
5 changes: 3 additions & 2 deletions ...-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/AllureAdapterExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import groovy.json.JsonOutput
import io.qameta.allure.gradle.base.tasks.ConditionalArgumentProvider
import io.qameta.allure.gradle.base.tasks.JavaAgentArgumentProvider
import io.qameta.allure.gradle.adapter.config.*
import io.qameta.allure.gradle.base.AllureExtension
import io.qameta.allure.gradle.util.conv
import io.qameta.allure.gradle.util.forUseAtConfigurationTimeBackport
import org.gradle.api.Action
Expand Down Expand Up @@ -40,9 +41,9 @@ open class AllureAdapterExtension @Inject constructor(
/**
* `allure-java` version (adapters for test engines)
*/
val allureJavaVersion: Property<String> = objects.property<String>().conv("2.13.9")
val allureJavaVersion: Property<String> = objects.property<String>().conv(project.the<AllureExtension>().version)
.forUseAtConfigurationTimeBackport()
val aspectjVersion: Property<String> = objects.property<String>().conv("1.9.5")
val aspectjVersion: Property<String> = objects.property<String>().conv("1.9.9.1")


/**
Expand Down
2 changes: 1 addition & 1 deletion allure-base-plugin/src/main/kotlin/io/qameta/allure/gradle/base/AllureExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class AllureExtension(
/**
* `allure-commandline` version
*/
val version: Property<String> = objects.property<String>().conv("2.13.6")
val version: Property<String> = objects.property<String>().conv("2.19.0")

// TODO: remove when deprecated [aspectjweaver] is removed
private val aspectjWeaver by lazy {
Expand Down
4 changes: 0 additions & 4 deletions allure-plugin/src/it/junit4-autoconfigure/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ plugins {
id 'io.qameta.allure'
}

allure {
version = '2.8.0'
}

repositories {
mavenCentral()
}
Expand Down