add new infix api to cc-infix bundles and to core

so that one can easily migrate to the new infix API. Moreover, suppress deprecations in core tests for now as we are going to deprecate the cc-infix. We will remove this suppression once we migrate to the new infix API
2026-03-10 08:01:19 +00:00 · 2020-04-10 22:43:12 +02:00
parent cc4b316844
commit 47facb86eb
16 changed files with 25 additions and 1 deletions
--- a/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-android/build.gradle
+++ b/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-android/build.gradle
@@ -5,6 +5,7 @@ dependencies {
    api prefixedProject('domain-builders-android')

    testImplementation prefixedProject('verbs-internal-android')
+    testImplementation prefixedProject('api-infix-en_GB-android')
 }

 srcAndResourcesFromJvmProject(project)
--- a/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-jvm/build.gradle
+++ b/apis/cc-infix-en_GB/atrium-api-cc-infix-en_GB-jvm/build.gradle
@@ -13,6 +13,7 @@ dependencies {
    api prefixedProject('domain-builders-jvm')

    testImplementation prefixedProject('verbs-internal-jvm')
+    testImplementation prefixedProject('api-infix-en_GB-jvm')
 }

 //TODO should not be necessary https://youtrack.jetbrains.com/issue/KT-28124
--- a/bundles/atrium-cc-infix-en_UK-robstoll/build.gradle
+++ b/bundles/atrium-cc-infix-en_UK-robstoll/build.gradle
@@ -3,7 +3,7 @@ description = 'Represents a deprecated convenience module which merely bundles d

 dependencies {
    api prefixedProject('verbs-jvm')
-    api prefixedProject('api-cc-infix-en_GB-jvm')
+    api prefixedProject('api-infix-en_GB-jvm')
    api prefixedProject('translations-en_GB-jvm')
    api prefixedProject('domain-builders-jvm')
    api prefixedProject('domain-api-jvm')
@@ -13,6 +13,7 @@ dependencies {
    runtimeOnly prefixedProject('core-robstoll-jvm')

    //TODO remove with 1.0.0
+    api prefixedProject('api-cc-infix-en_GB-jvm')
    api prefixedProject('api-cc-infix-en_UK')
    implementation prefixedProject('assertions')
    api prefixedProject('core-api-deprecated')
--- a/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-android/build.gradle
+++ b/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-android/build.gradle
@@ -10,4 +10,7 @@ dependencies {

    runtimeOnly prefixedProject('domain-robstoll-android')
    runtimeOnly prefixedProject('core-robstoll-android')
+
+    // here to ease migration; so that ReplaceWith of @Deprecated works
+    api prefixedProject('api-infix-en_GB-android')
 }
--- a/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-common/build.gradle
+++ b/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-common/build.gradle
@@ -10,4 +10,7 @@ dependencies {

    runtimeOnly prefixedProject('domain-robstoll-common')
    runtimeOnly prefixedProject('core-robstoll-common')
+
+    // here to ease migration; so that ReplaceWith of @Deprecated works
+    api prefixedProject('api-infix-en_GB-common')
 }
--- a/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-js/build.gradle
+++ b/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-js/build.gradle
@@ -11,4 +11,7 @@ dependencies {
    //TODO should be runtimeOnly but due to https://youtrack.jetbrains.com/issue/KT-27797 it cannot be
    implementation prefixedProject('domain-robstoll-js')
    implementation prefixedProject('core-robstoll-js')
+
+    // here to ease migration; so that ReplaceWith of @Deprecated works
+    api prefixedProject('api-infix-en_GB-js')
 }
--- a/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-jvm/build.gradle
+++ b/bundles/cc-infix-en_GB-robstoll/atrium-cc-infix-en_GB-robstoll-jvm/build.gradle
@@ -10,4 +10,7 @@ dependencies {

    runtimeOnly prefixedProject('domain-robstoll-jvm')
    runtimeOnly prefixedProject('core-robstoll-jvm')
+
+    // here to ease migration; so that ReplaceWith of @Deprecated works
+    api prefixedProject('api-infix-en_GB-jvm')
 }
--- a/core/api/atrium-core-api-android/build.gradle
+++ b/core/api/atrium-core-api-android/build.gradle
@@ -4,6 +4,7 @@ dependencies {
    api kbox(), excludeKotlin
    api kotlinReflect()

+    testImplementation prefixedProject('api-infix-en_GB-android')
    testImplementation prefixedProject('api-cc-infix-en_GB-android')
    testImplementation prefixedProject('specs-android')
 }
--- a/core/api/atrium-core-api-common/build.gradle
+++ b/core/api/atrium-core-api-common/build.gradle
@@ -3,6 +3,7 @@ description = 'API of the core of Atrium as common module'
 dependencies {
    api "ch.tutteli.kbox:kbox-common:$kbox_version", excludeKotlin

+    testImplementation prefixedProject('api-infix-en_GB-common')
    testImplementation prefixedProject('api-cc-infix-en_GB-common')
    testImplementation prefixedProject('specs-common')
 }
--- a/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/AtriumPropertyTest.kt
+++ b/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/AtriumPropertyTest.kt
@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION" /* remove once we have migrated to new infix API */)
 package ch.tutteli.atrium.core.polyfills

 import ch.tutteli.atrium.api.cc.infix.en_GB.toBe
--- a/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/LoadServicesTest.kt
+++ b/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/LoadServicesTest.kt
@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION" /* remove once we have migrated to new infix API */)
 package ch.tutteli.atrium.core.polyfills

 import ch.tutteli.atrium.api.cc.infix.en_GB.*
--- a/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/LoadSingleServiceTest.kt
+++ b/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/LoadSingleServiceTest.kt
@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION" /* remove once we have migrated to new infix API */)
 package ch.tutteli.atrium.core.polyfills

 import ch.tutteli.atrium.api.cc.infix.en_GB.Values
--- a/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/UseSingleServiceTest.kt
+++ b/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/core/polyfills/UseSingleServiceTest.kt
@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION" /* remove once we have migrated to new infix API */)
 package ch.tutteli.atrium.core.polyfills

 import ch.tutteli.atrium.api.cc.infix.en_GB.Values
--- a/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/reporting/AtriumErrorSpec.kt
+++ b/core/api/atrium-core-api-common/src/test/kotlin/ch/tutteli/atrium/reporting/AtriumErrorSpec.kt
@@ -1,3 +1,4 @@
+@file:Suppress("DEPRECATION" /* remove once we have migrated to new infix API */)
 package ch.tutteli.atrium.reporting

 import ch.tutteli.atrium.api.cc.infix.en_GB.property
--- a/core/api/atrium-core-api-js/build.gradle
+++ b/core/api/atrium-core-api-js/build.gradle
@@ -3,6 +3,7 @@ description = 'API of the core of Atrium for the JS platform.'
 dependencies {
    api "ch.tutteli.kbox:kbox-js:$kbox_version", excludeKotlin

+    testImplementation prefixedProject('api-infix-en_GB-js')
    testImplementation prefixedProject('api-cc-infix-en_GB-js')
    testImplementation prefixedProject('specs-js')
 }
--- a/core/api/atrium-core-api-jvm/build.gradle
+++ b/core/api/atrium-core-api-jvm/build.gradle
@@ -4,6 +4,7 @@ dependencies {
    api kbox(), excludeKotlin
    api kotlinReflect()

+    testImplementation prefixedProject('api-infix-en_GB-jvm')
    testImplementation prefixedProject('api-cc-infix-en_GB-jvm')
    testImplementation prefixedProject('specs-jvm')
 }