diff --git a/.evergreen/run-kotlin-tests.sh b/.evergreen/run-kotlin-tests.sh index fecceb28c53..a82c66e9e54 100755 --- a/.evergreen/run-kotlin-tests.sh +++ b/.evergreen/run-kotlin-tests.sh @@ -31,7 +31,10 @@ if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then export MULTI_MONGOS_URI_SYSTEM_PROPERTY="-Dorg.mongodb.test.multi.mongos.uri=${MONGODB_URI}" fi -echo "Running Kotlin tests" - ./gradlew -version -./gradlew kotlinCheck -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY} + +echo "Running Kotlin Unit Tests" +./gradlew :bson-kotlin:test :bson-kotlinx:test :driver-kotlin-sync:test :driver-kotlin-coroutine:test :driver-kotlin-extensions:test + +echo "Running Kotlin Integration Tests" +./gradlew :driver-kotlin-sync:integrationTest :driver-kotlin-coroutine:integrationTest -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY} diff --git a/.evergreen/static-checks.sh b/.evergreen/static-checks.sh index 8896692ca66..8b65b15e9a5 100755 --- a/.evergreen/static-checks.sh +++ b/.evergreen/static-checks.sh @@ -12,4 +12,4 @@ RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")" echo "Compiling JVM drivers" ./gradlew -version -./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest -x spotlessApply clean check scalaCheck kotlinCheck jar testClasses docs +./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest -x spotlessApply clean check scalaCheck jar testClasses docs diff --git a/bson-kotlin/build.gradle.kts b/bson-kotlin/build.gradle.kts index 3840b3169cf..45e8c9c0e5d 100644 --- a/bson-kotlin/build.gradle.kts +++ b/bson-kotlin/build.gradle.kts @@ -111,13 +111,6 @@ spotbugs { showProgress.set(true) } // =========================== // Test Configuration // =========================== -tasks.create("kotlinCheck") { - description = "Runs all the kotlin checks" - group = "verification" - - dependsOn("clean", "check") - tasks.findByName("check")?.mustRunAfter("clean") -} tasks.test { useJUnitPlatform() } diff --git a/bson-kotlinx/build.gradle.kts b/bson-kotlinx/build.gradle.kts index a278b4a3ab2..ac0b07f18eb 100644 --- a/bson-kotlinx/build.gradle.kts +++ b/bson-kotlinx/build.gradle.kts @@ -128,13 +128,6 @@ spotbugs { showProgress.set(true) } // =========================== // Test Configuration // =========================== -tasks.create("kotlinCheck") { - description = "Runs all the kotlin checks" - group = "verification" - - dependsOn("clean", "check") - tasks.findByName("check")?.mustRunAfter("clean") -} tasks.test { useJUnitPlatform() } diff --git a/driver-kotlin-coroutine/build.gradle.kts b/driver-kotlin-coroutine/build.gradle.kts index abd81fcd1d3..96ac4cc31eb 100644 --- a/driver-kotlin-coroutine/build.gradle.kts +++ b/driver-kotlin-coroutine/build.gradle.kts @@ -156,15 +156,6 @@ val integrationTest = classpath = sourceSets["integrationTest"].runtimeClasspath } -tasks.create("kotlinCheck") { - description = "Runs all the kotlin checks" - group = "verification" - - dependsOn("clean", "check", integrationTest) - tasks.findByName("check")?.mustRunAfter("clean") - tasks.findByName("integrationTest")?.mustRunAfter("check") -} - tasks.test { useJUnitPlatform() } // =========================== diff --git a/driver-kotlin-extensions/build.gradle.kts b/driver-kotlin-extensions/build.gradle.kts index 33fa0fa4294..5db6609a6f6 100644 --- a/driver-kotlin-extensions/build.gradle.kts +++ b/driver-kotlin-extensions/build.gradle.kts @@ -127,14 +127,6 @@ tasks.spotbugsMain { // Test Configuration // =========================== -tasks.create("kotlinCheck") { - description = "Runs all the kotlin checks" - group = "verification" - - dependsOn("clean", "check") - tasks.findByName("check")?.mustRunAfter("clean") -} - tasks.test { useJUnitPlatform() } // =========================== diff --git a/driver-kotlin-sync/build.gradle.kts b/driver-kotlin-sync/build.gradle.kts index 05b20b4803b..e7fb132cb36 100644 --- a/driver-kotlin-sync/build.gradle.kts +++ b/driver-kotlin-sync/build.gradle.kts @@ -150,15 +150,6 @@ val integrationTest = classpath = sourceSets["integrationTest"].runtimeClasspath } -tasks.create("kotlinCheck") { - description = "Runs all the kotlin checks" - group = "verification" - - dependsOn("clean", "check", integrationTest) - tasks.findByName("check")?.mustRunAfter("clean") - tasks.findByName("integrationTest")?.mustRunAfter("check") -} - tasks.test { useJUnitPlatform() } // ===========================