From 77dddf851fd14deac34592453556ec697ec7feb9 Mon Sep 17 00:00:00 2001 From: Emil Kantis Date: Tue, 28 Sep 2021 22:41:58 +0200 Subject: [PATCH 1/5] Kotest extensions have independent release cycles and should not be bundled into a single version property. --- .../testing-version-alias-rules.txt | 3 --- .../removed-dependencies-versions-keys.txt | 10 ++++++++++ .../dependencies-versions-key-validated.txt | 20 +++++++++---------- 3 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt diff --git a/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt b/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt index 653c62340..aced0ef07 100644 --- a/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt +++ b/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt @@ -7,9 +7,6 @@ org.junit.jupiter:junit-jupiter(-*) io.kotest:* ^^^^^^ -io.kotest.extensions:kotest-extensions-* - ^^^^^^^^^^^^^^^^^ - org.spekframework.spek2:spek-* ^^^^ diff --git a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt new file mode 100644 index 000000000..d0135041d --- /dev/null +++ b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt @@ -0,0 +1,10 @@ +io.kotest.extensions..kotest-extensions-allure=version.kotest-extensions +io.kotest.extensions..kotest-extensions-embedded-kafka=version.kotest-extensions +io.kotest.extensions..kotest-extensions-gherkin=version.kotest-extensions +io.kotest.extensions..kotest-extensions-koin=version.kotest-extensions +io.kotest.extensions..kotest-extensions-mockserver=version.kotest-extensions +io.kotest.extensions..kotest-extensions-pitest=version.kotest-extensions +io.kotest.extensions..kotest-extensions-robolectric=version.kotest-extensions +io.kotest.extensions..kotest-extensions-spring=version.kotest-extensions +io.kotest.extensions..kotest-extensions-testcontainers=version.kotest-extensions +io.kotest.extensions..kotest-extensions-wiremock=version.kotest-extensions diff --git a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt index d0b3342ba..34ddde1a9 100644 --- a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt +++ b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt @@ -608,16 +608,16 @@ io.kotest..kotest-property-arrow=version.kotest io.kotest..kotest-property=version.kotest io.kotest..kotest-runner-junit4=version.kotest io.kotest..kotest-runner-junit5=version.kotest -io.kotest.extensions..kotest-extensions-allure=version.kotest-extensions -io.kotest.extensions..kotest-extensions-embedded-kafka=version.kotest-extensions -io.kotest.extensions..kotest-extensions-gherkin=version.kotest-extensions -io.kotest.extensions..kotest-extensions-koin=version.kotest-extensions -io.kotest.extensions..kotest-extensions-mockserver=version.kotest-extensions -io.kotest.extensions..kotest-extensions-pitest=version.kotest-extensions -io.kotest.extensions..kotest-extensions-robolectric=version.kotest-extensions -io.kotest.extensions..kotest-extensions-spring=version.kotest-extensions -io.kotest.extensions..kotest-extensions-testcontainers=version.kotest-extensions -io.kotest.extensions..kotest-extensions-wiremock=version.kotest-extensions +io.kotest.extensions..kotest-extensions-allure=version.NO-RULE +io.kotest.extensions..kotest-extensions-embedded-kafka=version.NO-RULE +io.kotest.extensions..kotest-extensions-gherkin=version.NO-RULE +io.kotest.extensions..kotest-extensions-koin=version.NO-RULE +io.kotest.extensions..kotest-extensions-mockserver=version.NO-RULE +io.kotest.extensions..kotest-extensions-pitest=version.NO-RULE +io.kotest.extensions..kotest-extensions-robolectric=version.NO-RULE +io.kotest.extensions..kotest-extensions-spring=version.NO-RULE +io.kotest.extensions..kotest-extensions-testcontainers=version.NO-RULE +io.kotest.extensions..kotest-extensions-wiremock=version.NO-RULE io.ktor..ktor-auth-jwt=version.ktor io.ktor..ktor-auth-ldap=version.ktor io.ktor..ktor-auth=version.ktor From 190479f3b9fe240e4bb2ed3d79c04a4af4364a81 Mon Sep 17 00:00:00 2001 From: Emil Kantis Date: Tue, 28 Sep 2021 22:42:38 +0200 Subject: [PATCH 2/5] Added notations for kotest-framework-api and kotest-framework-datatest --- .../dependencies/src/main/kotlin/dependencies/Testing.kt | 7 +++++++ .../src/test/resources/bundled-dependencies-validated.txt | 2 ++ .../src/test/resources/dependencies-mapping-validated.txt | 2 ++ .../test/resources/dependencies-versions-key-validated.txt | 2 ++ 4 files changed, 13 insertions(+) diff --git a/plugins/dependencies/src/main/kotlin/dependencies/Testing.kt b/plugins/dependencies/src/main/kotlin/dependencies/Testing.kt index 23f988ed7..027296072 100644 --- a/plugins/dependencies/src/main/kotlin/dependencies/Testing.kt +++ b/plugins/dependencies/src/main/kotlin/dependencies/Testing.kt @@ -98,6 +98,13 @@ object Testing { ) val extensions = Extensions + val framework = Framework + object Framework : IsNotADependency { + + val api = module("kotest-framework-api") + val datatest = module("kotest-framework-datatest") + } + @Deprecated( message = "Since Kotest 4.5.0 extensions have a separate lifecycle per extension", replaceWith = ReplaceWith("Testing.KotestExtensions") diff --git a/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt b/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt index c94d087a4..51ae3637d 100644 --- a/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt +++ b/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt @@ -613,6 +613,8 @@ io.kotest:kotest-extensions-koin io.kotest:kotest-extensions-mockserver io.kotest:kotest-extensions-spring io.kotest:kotest-extensions-testcontainers +io.kotest:kotest-framework-api +io.kotest:kotest-framework-datatest io.kotest:kotest-plugins-pitest io.kotest:kotest-property io.kotest:kotest-property-arrow diff --git a/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt b/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt index 5b41a1c64..ab1cb79d2 100644 --- a/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt +++ b/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt @@ -663,6 +663,8 @@ io.kotest..kotest-extensions-koin=Testing.kotest.extensions.koin io.kotest..kotest-extensions-mockserver=Testing.kotest.extensions.mockServer io.kotest..kotest-extensions-spring=Testing.kotest.extensions.spring io.kotest..kotest-extensions-testcontainers=Testing.kotest.extensions.testContainers +io.kotest..kotest-framework-api=Testing.kotest.framework.api +io.kotest..kotest-framework-datatest=Testing.kotest.framework.datatest io.kotest..kotest-plugins-pitest=Testing.kotest.plugins.piTest io.kotest..kotest-property-arrow=Testing.kotest.propertyArrow io.kotest..kotest-property=Testing.kotest.property diff --git a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt index 34ddde1a9..9d7c9ca68 100644 --- a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt +++ b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt @@ -603,6 +603,8 @@ io.kotest..kotest-extensions-koin=version.kotest io.kotest..kotest-extensions-mockserver=version.kotest io.kotest..kotest-extensions-spring=version.kotest io.kotest..kotest-extensions-testcontainers=version.kotest +io.kotest..kotest-framework-api=version.kotest +io.kotest..kotest-framework-datatest=version.kotest io.kotest..kotest-plugins-pitest=version.kotest io.kotest..kotest-property-arrow=version.kotest io.kotest..kotest-property=version.kotest From 5200d63d773eeeae11b3ec6eba729e54db85d870 Mon Sep 17 00:00:00 2001 From: Emil Kantis Date: Wed, 29 Sep 2021 21:38:27 +0200 Subject: [PATCH 3/5] Added alias rules for kotest extensions --- .../testing-version-alias-rules.txt | 30 +++++++++++++++++++ .../removed-dependencies-versions-keys.txt | 10 ------- .../dependencies-versions-key-validated.txt | 20 ++++++------- 3 files changed, 40 insertions(+), 20 deletions(-) delete mode 100644 plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt diff --git a/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt b/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt index aced0ef07..768b54a73 100644 --- a/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt +++ b/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt @@ -7,6 +7,36 @@ org.junit.jupiter:junit-jupiter(-*) io.kotest:* ^^^^^^ +io.kotest.extensions:kotest-extensions-allure + ^^^^^^.^^^^^^^^^^.^^^^^^ + +io.kotest.extensions:kotest-extensions-embedded-kafka + ^^^^^^.^^^^^^^^^^.^^^^^^^^^^^^^^ + +io.kotest.extensions:kotest-extensions-gherkin + ^^^^^^.^^^^^^^^^^.^^^^^^^ + +io.kotest.extensions:kotest-extensions-koin + ^^^^^^.^^^^^^^^^^.^^^^ + +io.kotest.extensions:kotest-extensions-mockserver + ^^^^^^.^^^^^^^^^^.^^^^^^^^^^ + +io.kotest.extensions:kotest-extensions-pitest + ^^^^^^.^^^^^^^^^^.^^^^^^ + +io.kotest.extensions:kotest-extensions-robolectric + ^^^^^^.^^^^^^^^^^.^^^^^^^^^^^ + +io.kotest.extensions:kotest-extensions-spring + ^^^^^^.^^^^^^^^^^.^^^^^^ + +io.kotest.extensions:kotest-extensions-testcontainers + ^^^^^^.^^^^^^^^^^.^^^^^^^^^^^^^^ + +io.kotest.extensions:kotest-extensions-wiremock + ^^^^^^.^^^^^^^^^^.^^^^^^^^ + org.spekframework.spek2:spek-* ^^^^ diff --git a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt deleted file mode 100644 index d0135041d..000000000 --- a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt +++ /dev/null @@ -1,10 +0,0 @@ -io.kotest.extensions..kotest-extensions-allure=version.kotest-extensions -io.kotest.extensions..kotest-extensions-embedded-kafka=version.kotest-extensions -io.kotest.extensions..kotest-extensions-gherkin=version.kotest-extensions -io.kotest.extensions..kotest-extensions-koin=version.kotest-extensions -io.kotest.extensions..kotest-extensions-mockserver=version.kotest-extensions -io.kotest.extensions..kotest-extensions-pitest=version.kotest-extensions -io.kotest.extensions..kotest-extensions-robolectric=version.kotest-extensions -io.kotest.extensions..kotest-extensions-spring=version.kotest-extensions -io.kotest.extensions..kotest-extensions-testcontainers=version.kotest-extensions -io.kotest.extensions..kotest-extensions-wiremock=version.kotest-extensions diff --git a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt index 9d7c9ca68..e3d98e878 100644 --- a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt +++ b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt @@ -610,16 +610,16 @@ io.kotest..kotest-property-arrow=version.kotest io.kotest..kotest-property=version.kotest io.kotest..kotest-runner-junit4=version.kotest io.kotest..kotest-runner-junit5=version.kotest -io.kotest.extensions..kotest-extensions-allure=version.NO-RULE -io.kotest.extensions..kotest-extensions-embedded-kafka=version.NO-RULE -io.kotest.extensions..kotest-extensions-gherkin=version.NO-RULE -io.kotest.extensions..kotest-extensions-koin=version.NO-RULE -io.kotest.extensions..kotest-extensions-mockserver=version.NO-RULE -io.kotest.extensions..kotest-extensions-pitest=version.NO-RULE -io.kotest.extensions..kotest-extensions-robolectric=version.NO-RULE -io.kotest.extensions..kotest-extensions-spring=version.NO-RULE -io.kotest.extensions..kotest-extensions-testcontainers=version.NO-RULE -io.kotest.extensions..kotest-extensions-wiremock=version.NO-RULE +io.kotest.extensions..kotest-extensions-allure=version.kotest.extensions.allure +io.kotest.extensions..kotest-extensions-embedded-kafka=version.kotest.extensions.embedded-kafka +io.kotest.extensions..kotest-extensions-gherkin=version.kotest.extensions.gherkin +io.kotest.extensions..kotest-extensions-koin=version.kotest.extensions.koin +io.kotest.extensions..kotest-extensions-mockserver=version.kotest.extensions.mockserver +io.kotest.extensions..kotest-extensions-pitest=version.kotest.extensions.pitest +io.kotest.extensions..kotest-extensions-robolectric=version.kotest.extensions.robolectric +io.kotest.extensions..kotest-extensions-spring=version.kotest.extensions.spring +io.kotest.extensions..kotest-extensions-testcontainers=version.kotest.extensions.testcontainers +io.kotest.extensions..kotest-extensions-wiremock=version.kotest.extensions.wiremock io.ktor..ktor-auth-jwt=version.ktor io.ktor..ktor-auth-ldap=version.ktor io.ktor..ktor-auth=version.ktor From f5a971a9a45bc8341f9e26a0bf03a4d4ebe31f9c Mon Sep 17 00:00:00 2001 From: Emil Kantis Date: Thu, 30 Sep 2021 09:28:44 +0200 Subject: [PATCH 4/5] Merge rules --- .../testing-version-alias-rules.txt | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt b/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt index 768b54a73..91ecb4486 100644 --- a/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt +++ b/plugins/dependencies/src/main/resources/refreshVersions-rules/testing-version-alias-rules.txt @@ -7,35 +7,8 @@ org.junit.jupiter:junit-jupiter(-*) io.kotest:* ^^^^^^ -io.kotest.extensions:kotest-extensions-allure - ^^^^^^.^^^^^^^^^^.^^^^^^ - -io.kotest.extensions:kotest-extensions-embedded-kafka - ^^^^^^.^^^^^^^^^^.^^^^^^^^^^^^^^ - -io.kotest.extensions:kotest-extensions-gherkin - ^^^^^^.^^^^^^^^^^.^^^^^^^ - -io.kotest.extensions:kotest-extensions-koin - ^^^^^^.^^^^^^^^^^.^^^^ - -io.kotest.extensions:kotest-extensions-mockserver - ^^^^^^.^^^^^^^^^^.^^^^^^^^^^ - -io.kotest.extensions:kotest-extensions-pitest - ^^^^^^.^^^^^^^^^^.^^^^^^ - -io.kotest.extensions:kotest-extensions-robolectric - ^^^^^^.^^^^^^^^^^.^^^^^^^^^^^ - -io.kotest.extensions:kotest-extensions-spring - ^^^^^^.^^^^^^^^^^.^^^^^^ - -io.kotest.extensions:kotest-extensions-testcontainers - ^^^^^^.^^^^^^^^^^.^^^^^^^^^^^^^^ - -io.kotest.extensions:kotest-extensions-wiremock - ^^^^^^.^^^^^^^^^^.^^^^^^^^ +io.kotest.extensions:kotest-extensions-* + ^^^^^^.^^^^^^^^^^.^ org.spekframework.spek2:spek-* ^^^^ From f759860dea88401b33710999bfdbc05533d12bd1 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Thu, 30 Sep 2021 16:00:43 +0200 Subject: [PATCH 5/5] Add back removed-dependencies-versions-keys.txt --- .../resources/removed-dependencies-versions-keys.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt diff --git a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt new file mode 100644 index 000000000..d0135041d --- /dev/null +++ b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt @@ -0,0 +1,10 @@ +io.kotest.extensions..kotest-extensions-allure=version.kotest-extensions +io.kotest.extensions..kotest-extensions-embedded-kafka=version.kotest-extensions +io.kotest.extensions..kotest-extensions-gherkin=version.kotest-extensions +io.kotest.extensions..kotest-extensions-koin=version.kotest-extensions +io.kotest.extensions..kotest-extensions-mockserver=version.kotest-extensions +io.kotest.extensions..kotest-extensions-pitest=version.kotest-extensions +io.kotest.extensions..kotest-extensions-robolectric=version.kotest-extensions +io.kotest.extensions..kotest-extensions-spring=version.kotest-extensions +io.kotest.extensions..kotest-extensions-testcontainers=version.kotest-extensions +io.kotest.extensions..kotest-extensions-wiremock=version.kotest-extensions