Update transitive dependencies of JVM test frameworks in kotlin-test KT-65242, KT-63397

This commit is contained in:
Ilya Gorbunov
2024-01-24 03:19:18 +01:00
committed by Space Team
parent a636f822d0
commit 58c03e021b
4 changed files with 54 additions and 38 deletions
+34 -28
View File
@@ -798,6 +798,12 @@
<sha256 value="905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed" origin="Generated by Gradle"/> <sha256 value="905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.google.code.findbugs" name="jsr305" version="3.0.1">
<artifact name="jsr305-3.0.1.jar">
<md5 value="c6532beb3f7cc54a8d73d25d5602b9e4" origin="Generated by Gradle"/>
<sha256 value="c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.code.findbugs" name="jsr305" version="3.0.2"> <component group="com.google.code.findbugs" name="jsr305" version="3.0.2">
<artifact name="jsr305-3.0.2.jar"> <artifact name="jsr305-3.0.2.jar">
<md5 value="dd83accb899363c32b07d7a1b2e4ce40" origin="Generated by Gradle"/> <md5 value="dd83accb899363c32b07d7a1b2e4ce40" origin="Generated by Gradle"/>
@@ -3130,12 +3136,6 @@
<sha256 value="1f58b77470d8d147a0538d515347dd322f49a83b9e884b8970051160464b65b3" origin="Generated by Gradle"/> <sha256 value="1f58b77470d8d147a0538d515347dd322f49a83b9e884b8970051160464b65b3" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apiguardian" name="apiguardian-api" version="1.1.0">
<artifact name="apiguardian-api-1.1.0.jar">
<md5 value="944805817b648e558ed6be6fc7f054f3" origin="Generated by Gradle"/>
<sha256 value="a9aae9ff8ae3e17a2a18f79175e82b16267c246fbbd3ca9dfbbb290b08dcfdd4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apiguardian" name="apiguardian-api" version="1.1.2"> <component group="org.apiguardian" name="apiguardian-api" version="1.1.2">
<artifact name="apiguardian-api-1.1.2.jar"> <artifact name="apiguardian-api-1.1.2.jar">
<md5 value="8c7de3f82037fa4a2e8be2a2f13092af" origin="Generated by Gradle"/> <md5 value="8c7de3f82037fa4a2e8be2a2f13092af" origin="Generated by Gradle"/>
@@ -4428,10 +4428,10 @@
<sha256 value="108088fd7ea46a8e65a0ce7f5d75ae3ff7865606770a078715f5a6e5709e17d8" origin="Generated by Gradle"/> <sha256 value="108088fd7ea46a8e65a0ce7f5d75ae3ff7865606770a078715f5a6e5709e17d8" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.jupiter" name="junit-jupiter-api" version="5.6.3"> <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.10.1">
<artifact name="junit-jupiter-api-5.6.3.jar"> <artifact name="junit-jupiter-api-5.10.1.jar">
<md5 value="b27438dcf9c99c73c9a0ff79cf4538de" origin="Generated by Gradle"/> <md5 value="c6b8b04f2910f6cef6ac10846f43a92d" origin="Generated by Gradle"/>
<sha256 value="26a22fe54dca351da9edccbcaa3c3cdcf25862cef3d2e04aa9363029a7beaa9d" origin="Generated by Gradle"/> <sha256 value="60d5c398c32dc7039b99282514ad6064061d8417cf959a1f6bd2038cc907c913" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.jupiter" name="junit-jupiter-api" version="5.9.2"> <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.9.2">
@@ -4446,10 +4446,10 @@
<sha256 value="57ea48e6f795200791065bbc86b70b84cd05367c5c9f2ac8f9268e27154c88a8" origin="Generated by Gradle"/> <sha256 value="57ea48e6f795200791065bbc86b70b84cd05367c5c9f2ac8f9268e27154c88a8" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.6.3"> <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.10.1">
<artifact name="junit-jupiter-engine-5.6.3.jar"> <artifact name="junit-jupiter-engine-5.10.1.jar">
<md5 value="39324eb3b4ff1365dd3f9ae2421d6d60" origin="Generated by Gradle"/> <md5 value="71d86cd027062c4da0796c2493ae94fe" origin="Generated by Gradle"/>
<sha256 value="980fbd50df3eeeb3e6b0868a22977148b3ac78cfae1dff3d593d656f2328dab1" origin="Generated by Gradle"/> <sha256 value="02930dfe495f93fe70b26550ace3a28f7e1b900c84426c2e4626ce020c7282d6" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.9.2"> <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.9.2">
@@ -4476,10 +4476,10 @@
<sha256 value="6083db08ca11fca1e16099d0dcfede0193d80b3762b276349d80d3da536791b2" origin="Generated by Gradle"/> <sha256 value="6083db08ca11fca1e16099d0dcfede0193d80b3762b276349d80d3da536791b2" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.platform" name="junit-platform-commons" version="1.6.3"> <component group="org.junit.platform" name="junit-platform-commons" version="1.10.1">
<artifact name="junit-platform-commons-1.6.3.jar"> <artifact name="junit-platform-commons-1.10.1.jar">
<md5 value="9fd0e23cd3409e8698e521d6953d6a18" origin="Generated by Gradle"/> <md5 value="cd430f3f7345c0888f8408ce8795c751" origin="Generated by Gradle"/>
<sha256 value="49be6439351fdb50f0b7827e555acad26504a8084b6bc4019b2e6d73bc9da91a" origin="Generated by Gradle"/> <sha256 value="7d9855ee3f3f71f015eb1479559bf923783243c24fbfbd8b29bed8e8099b5672" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.platform" name="junit-platform-commons" version="1.9.2"> <component group="org.junit.platform" name="junit-platform-commons" version="1.9.2">
@@ -4494,10 +4494,10 @@
<sha256 value="cd338efd02ee73966ea754e0c0c71e1a11f4af5db9c2003e4b6137e119155abe" origin="Generated by Gradle"/> <sha256 value="cd338efd02ee73966ea754e0c0c71e1a11f4af5db9c2003e4b6137e119155abe" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.platform" name="junit-platform-engine" version="1.6.3"> <component group="org.junit.platform" name="junit-platform-engine" version="1.10.1">
<artifact name="junit-platform-engine-1.6.3.jar"> <artifact name="junit-platform-engine-1.10.1.jar">
<md5 value="a59595c7f2e5f6c2f83850bc7aa007c0" origin="Generated by Gradle"/> <md5 value="4d571057589cd109f3f4bedf7bbf5e7a" origin="Generated by Gradle"/>
<sha256 value="de3b86523a65d824fa8e148c5ec510c4e034701b43100773f8c2e35da80ba0ec" origin="Generated by Gradle"/> <sha256 value="baa48e470d6dee7369a0a8820c51da89c1463279eda6e13a304d11f45922c760" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.platform" name="junit-platform-engine" version="1.9.2"> <component group="org.junit.platform" name="junit-platform-engine" version="1.9.2">
@@ -4512,6 +4512,12 @@
<sha256 value="8c60b661ac170701a635dfc67565efbb8c85b5c5cdd5a4a9576e3a015c7111a4" origin="Generated by Gradle"/> <sha256 value="8c60b661ac170701a635dfc67565efbb8c85b5c5cdd5a4a9576e3a015c7111a4" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.junit.platform" name="junit-platform-launcher" version="1.10.1">
<artifact name="junit-platform-launcher-1.10.1.jar">
<md5 value="48761921601bb4bec86cff7ecfd0fef2" origin="Generated by Gradle"/>
<sha256 value="ded414c504e88d02270331071969084e1b2fd9bcf8443f35d44da2c6e3301bc2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.junit.platform" name="junit-platform-launcher" version="1.9.2"> <component group="org.junit.platform" name="junit-platform-launcher" version="1.9.2">
<artifact name="junit-platform-launcher-1.9.2.jar"> <artifact name="junit-platform-launcher-1.9.2.jar">
<md5 value="2c657233f3e710edea504844470e0e98" origin="Generated by Gradle"/> <md5 value="2c657233f3e710edea504844470e0e98" origin="Generated by Gradle"/>
@@ -4910,12 +4916,6 @@
<sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/> <sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.testng" name="testng" version="6.13.1">
<artifact name="testng-6.13.1.jar">
<md5 value="d54659174669a28f0e00edef4d1584b7" origin="Generated by Gradle"/>
<sha256 value="0d462f670c3a5ccd471991b120043f84a1943394df291dec9564cdc29cabe384" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.testng" name="testng" version="7.0.0"> <component group="org.testng" name="testng" version="7.0.0">
<artifact name="testng-7.0.0.jar"> <artifact name="testng-7.0.0.jar">
<md5 value="2bba0177e767bd02dbe513297ad62fa9" origin="Generated by Gradle"/> <md5 value="2bba0177e767bd02dbe513297ad62fa9" origin="Generated by Gradle"/>
@@ -4928,6 +4928,12 @@
<sha256 value="e549db50dcc421f9501d6af933af15e4fba96617577409d939724cd7e1a25033" origin="Generated by Gradle"/> <sha256 value="e549db50dcc421f9501d6af933af15e4fba96617577409d939724cd7e1a25033" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.testng" name="testng" version="7.5.1">
<artifact name="testng-7.5.1.jar">
<md5 value="86e2f3f5080bdca34ee7e6097647d600" origin="Generated by Gradle"/>
<sha256 value="a5ac92d2362ccb3a509abe68e385ca809a7c96fcbaf851b3ee8bacb2ac899e2f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.vafer" name="jdependency" version="2.8.0"> <component group="org.vafer" name="jdependency" version="2.8.0">
<artifact name="jdependency-2.8.0.jar"> <artifact name="jdependency-2.8.0.jar">
<md5 value="c7bb2436eaa4cf7d9067dfc5c8250bf6" origin="Generated by Gradle"/> <md5 value="c7bb2436eaa4cf7d9067dfc5c8250bf6" origin="Generated by Gradle"/>
+11 -7
View File
@@ -82,9 +82,6 @@ kotlin {
val java9CompileOnly = configurations[frameworkJava9SourceSet.compileOnlyConfigurationName] val java9CompileOnly = configurations[frameworkJava9SourceSet.compileOnlyConfigurationName]
project.dependencies { project.dependencies {
java9CompileOnly(project) java9CompileOnly(project)
if (framework == JvmTestFramework.TestNG) {
java9CompileOnly("org.testng:testng:7.0.0")
}
} }
} }
test.associateWith(getByName("JUnit")) test.associateWith(getByName("JUnit"))
@@ -176,6 +173,7 @@ kotlin {
kotlin.srcDir("junit5/src/test/kotlin") kotlin.srcDir("junit5/src/test/kotlin")
dependencies { dependencies {
runtimeOnly(libs.junit.jupiter.engine) runtimeOnly(libs.junit.jupiter.engine)
runtimeOnly(libs.junit.platform.launcher)
} }
} }
val jvmTestNG by getting { val jvmTestNG by getting {
@@ -183,11 +181,14 @@ kotlin {
kotlin.srcDir("testng/src/main/kotlin") kotlin.srcDir("testng/src/main/kotlin")
resources.srcDir("testng/src/main/resources") resources.srcDir("testng/src/main/resources")
dependencies { dependencies {
api("org.testng:testng:6.13.1") api("org.testng:testng:7.0.0")
} }
} }
val jvmTestNGTest by getting { val jvmTestNGTest by getting {
kotlin.srcDir("testng/src/test/kotlin") kotlin.srcDir("testng/src/test/kotlin")
dependencies {
implementation("org.testng:testng:7.5.1")
}
} }
val jsMain by getting { val jsMain by getting {
dependsOn(assertionsCommonMain) dependsOn(assertionsCommonMain)
@@ -363,10 +364,13 @@ configurations {
when (framework) { when (framework) {
JvmTestFramework.JUnit -> {} JvmTestFramework.JUnit -> {}
JvmTestFramework.JUnit5 -> { JvmTestFramework.JUnit5 -> {
apiElements("org.junit.jupiter:junit-jupiter-api:5.6.3") apiElements("org.junit.jupiter:junit-jupiter-api:5.10.1")
runtimeDeps("org.junit.jupiter:junit-jupiter-engine:5.6.3") runtimeDeps("org.junit.jupiter:junit-jupiter-engine:5.10.1")
runtimeDeps("org.junit.platform:junit-platform-launcher:1.10.1")
}
JvmTestFramework.TestNG -> {
apiElements("org.testng:testng:7.5.1")
} }
JvmTestFramework.TestNG -> {}
} }
} }
artifacts { artifacts {
@@ -41,13 +41,19 @@
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>5.6.3</version> <version>5.10.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>5.6.3</version> <version>5.10.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.10.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -41,7 +41,7 @@
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>6.13.1</version> <version>7.5.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>