clean up build file and more deprecations (via allure-framework#328)

KroArtem · Feb 14, 2019 · f82e7ff · f82e7ff
1 parent 22a1de6
commit f82e7ff
Show file tree

Hide file tree

Showing 32 changed files with 269 additions and 87 deletions.
diff --git a/allure-assertj/build.gradle.kts b/allure-assertj/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure AssertJ Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 dependencies {
  agent("org.aspectj:aspectjweaver")
@@ -15,15 15,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.assertj"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure Attachments"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 dependencies {
  agent("org.aspectj:aspectjweaver")
@@ -16,15 16,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.attachment"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure Citrus Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val citrusVersion = "2.8.0"
 
@@ -21,15 21,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.citrus"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  exclude("**/samples/*")
  doFirst {

diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure CucumberJVM Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val cucumberVersion = "1.2.5"
 
@@ -21,15 21,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.cucumberjvm"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber2-jvm/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure CucumberJVM 2.0 Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val cucumberVersion = "2.3.1"
 
@@ -19,15 19,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.cucumber2jvm"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure CucumberJVM 3.0 Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val cucumberVersion = "3.0.0"
 
@@ -19,15 19,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.cucumber3jvm"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure CucumberJVM 4.0"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val cucumberVersion = "4.2.3"
 
@@ -19,15 19,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.cucumber4jvm"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure Javadoc Descriptions"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 dependencies {
  agent("org.aspectj:aspectjweaver")
@@ -16,15 16,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.description"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure Apache HttpClient Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 dependencies {
  agent("org.aspectj:aspectjweaver")
@@ -17,15 17,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.httpclient"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-java-commons-test/build.gradle.kts b/allure-java-commons-test/build.gradle.kts
@@ -5,7 5,7 @@ dependencies {
  api(project(":allure-java-commons"))
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.commonstest"

diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure Java Commons"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 dependencies {
  agent("org.aspectj:aspectjweaver")
@@ -23,15 23,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.commons"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure Java Migration Utils"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val junitVersion = "4.12"
 val testNgVersion = "6.14.3"
@@ -25,15 25,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.migration"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure JAX-RS Filter Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val javaxWsRsApiVersion = "2.1.1"
 
@@ -19,15 19,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.jaxrs"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure JBehave Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val jbehaveVersion = "4.3.5"
 
@@ -18,15 18,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.jbehave"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure JsonUnit Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 val jsonUnitVersion = "2.3.0"
 
@@ -20,15 20,15 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.jsonunit"
  ))
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  useJUnitPlatform()
  doFirst {
  jvmArgs("-javaagent:${agent.singleFile}")

diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts
@@ -1,6 1,6 @@
 description = "Allure JUnit Platform Integration"
 
-val agent by configurations.creating
 val agent: Configuration by configurations.creating
 
 dependencies {
  agent("org.aspectj:aspectjweaver")
@@ -18,7 18,7 @@ dependencies {
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
-tasks.named<Jar>("jar") {
 tasks.jar {
  manifest {
  attributes(mapOf(
  "Automatic-Module-Name" to "io.qameta.allure.junitplatform"
@@ -29,7 29,7 @@ tasks.named<Jar>("jar") {
  }
 }
 
-tasks.named<Test>("test") {
 tasks.test {
  systemProperty("junit.jupiter.execution.parallel.enabled", "false")
  useJUnitPlatform()
  exclude("**/features/*")