(chore): gradle

Trendyol · May 16, 2024 · 455bf61 · 455bf61
1 parent 52cdbed
commit 455bf61
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Gradle Build and Test
         uses: gradle/[email protected]
         with:
-          arguments: --build-cache build test koverXmlReport testAggregateXmlReports
+          arguments: --build-cache build test koverXmlReport
 
       - name: Add coverage report to PR
         id: kover

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,11 +7,10 @@ plugins {
   alias(libs.plugins.dokka)
   alias(libs.plugins.spotless)
   alias(libs.plugins.gitVersioning)
-  `test-report-aggregation`
-  id("stove-publishing") apply false
   alias(libs.plugins.testLogger)
   alias(libs.plugins.kover)
   alias(libs.plugins.detekt)
+  id("stove-publishing") apply false
   idea
   java
 }
@@ -55,7 +54,6 @@ subprojects.of("lib", "spring", "examples", "ktor") {
     plugin("kotlin")
     plugin(rootProject.libs.plugins.spotless.get().pluginId)
     plugin(rootProject.libs.plugins.dokka.get().pluginId)
-    plugin("test-report-aggregation")
     plugin(rootProject.libs.plugins.testLogger.get().pluginId)
     plugin(rootProject.libs.plugins.kover.get().pluginId)
     plugin(rootProject.libs.plugins.detekt.get().pluginId)
@@ -76,8 +74,8 @@ subprojects.of("lib", "spring", "examples", "ktor") {
   dependencies {
     testImplementation(kotlin("test"))
     testImplementation(libs.kotest.runner.junit5)
-    testImplementation(libs.kotest.framework.api.jvm)
-    testImplementation(libs.kotest.property.jvm)
+    testImplementation(libs.kotest.framework.api)
+    testImplementation(libs.kotest.property)
     detektPlugins(libs.detekt.formatting)
   }
 
@@ -127,19 +125,6 @@ subprojects.of("lib", "spring", "examples", "ktor") {
   }
 }
 
-tasks.register<Copy>("testAggregateXmlReports") {
-  group = "Reporting"
-  related.forEach {
-    dependsOn(it.tasks.testAggregateTestReport)
-    mustRunAfter(it.tasks.testAggregateTestReport)
-  }
-  val testResults = related.map { it.tasks.test.get().outputs.files }
-  duplicatesStrategy = DuplicatesStrategy.WARN
-  from(testResults)
-  include("*.xml")
-  into(rootProject.layout.buildDirectory.dir("reports/xml"))
-}
-
 val publishedProjects = listOf(
   "stove-testing-e2e",
   "stove-testing-e2e-couchbase",

diff --git a/examples/ktor-example/build.gradle.kts b/examples/ktor-example/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 
 dependencies {
   testImplementation(libs.ktor.server.tests.jvm)
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.kotest.runner.junit5)
   testImplementation(libs.logback.classic)
 

diff --git a/examples/spring-example/build.gradle.kts b/examples/spring-example/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 }
 
 dependencies {
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.kotest.runner.junit5)
   testImplementation(projects.stove.lib.stoveTestingE2eHttp)
   testImplementation(projects.stove.lib.stoveTestingE2eWiremock)

diff --git a/examples/spring-standalone-example/build.gradle.kts b/examples/spring-standalone-example/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 }
 
 dependencies {
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.kotest.runner.junit5)
   testImplementation(projects.stove.lib.stoveTestingE2eHttp)
   testImplementation(projects.stove.lib.stoveTestingE2eWiremock)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -139,8 +139,8 @@ mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "
 junit = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
-kotest-property-jvm = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
-kotest-framework-api-jvm = { module = "io.kotest:kotest-framework-api-jvm", version.ref = "kotest" }
+kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
+kotest-framework-api = { module = "io.kotest:kotest-framework-api", version.ref = "kotest" }
 ktor-server-tests-jvm = { module = "io.ktor:ktor-server-tests-jvm", version.ref = "ktor" }
 
 [plugins]

diff --git a/recipes/gradle/libs.versions.toml b/recipes/gradle/libs.versions.toml
@@ -174,8 +174,8 @@ lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 junit = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
-kotest-property-jvm = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
-kotest-framework-api-jvm = { module = "io.kotest:kotest-framework-api-jvm", version.ref = "kotest" }
+kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
+kotest-framework-api = { module = "io.kotest:kotest-framework-api", version.ref = "kotest" }
 
 # Stove
 stove-testing = { module = "com.trendyol:stove-testing-e2e", version.ref = "stove" }

diff --git a/recipes/java-recipes/spring-boot-recipe/build.gradle.kts b/recipes/java-recipes/spring-boot-recipe/build.gradle.kts
@@ -17,8 +17,8 @@ dependencies {
 
 dependencies {
   testImplementation(libs.kotest.runner.junit5)
-  testImplementation(libs.kotest.framework.api.jvm)
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.framework.api)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.stove.testing)
   testImplementation(libs.stove.testing.couchbase)
   testImplementation(libs.stove.testing.http)

diff --git a/recipes/kotlin-recipes/ktor-recipe/build.gradle.kts b/recipes/kotlin-recipes/ktor-recipe/build.gradle.kts
@@ -35,8 +35,8 @@ dependencies {
 
 dependencies {
   testImplementation(libs.kotest.runner.junit5)
-  testImplementation(libs.kotest.framework.api.jvm)
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.framework.api)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.stove.testing)
   testImplementation(libs.stove.testing.mongodb)
   testImplementation(libs.stove.testing.http)

diff --git a/recipes/kotlin-recipes/spring-boot-recipe/build.gradle.kts b/recipes/kotlin-recipes/spring-boot-recipe/build.gradle.kts
@@ -5,8 +5,8 @@ dependencies {
 }
 dependencies {
   testImplementation(libs.kotest.runner.junit5)
-  testImplementation(libs.kotest.framework.api.jvm)
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.framework.api)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.stove.testing)
   testImplementation(libs.stove.testing.couchbase)
   testImplementation(libs.stove.testing.http)

diff --git a/recipes/scala-recipes/spring-boot-recipe/build.gradle.kts b/recipes/scala-recipes/spring-boot-recipe/build.gradle.kts
@@ -18,8 +18,8 @@ dependencies {
 
 dependencies {
   testImplementation(libs.kotest.runner.junit5)
-  testImplementation(libs.kotest.framework.api.jvm)
-  testImplementation(libs.kotest.property.jvm)
+  testImplementation(libs.kotest.framework.api)
+  testImplementation(libs.kotest.property)
   testImplementation(libs.stove.testing)
   testImplementation(libs.stove.testing.couchbase)
   testImplementation(libs.stove.testing.http)

diff --git a/recipes/shared/application/build.gradle.kts b/recipes/shared/application/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 dependencies {
   testCompileOnly(libs.lombok)
   testAnnotationProcessor(libs.lombok)
-  testImplementation(libs.kotest.framework.api.jvm)
+  testImplementation(libs.kotest.framework.api)
   testImplementation(libs.kotest.runner.junit5)
   testImplementation(libs.arrow.core)
 }
diff --git a/recipes/shared/domain/build.gradle.kts b/recipes/shared/domain/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 dependencies {
   testCompileOnly(libs.lombok)
   testAnnotationProcessor(libs.lombok)
-  testImplementation(libs.kotest.framework.api.jvm)
+  testImplementation(libs.kotest.framework.api)
   testImplementation(libs.kotest.runner.junit5)
   testImplementation(libs.arrow.core)
 }