Merge pull request #1146 from robstoll/migrate-to-new-mpp

further migration to new mpp

.github/ISSUE_TEMPLATE/good_first_issue.md

@@ -26,13 +26,13 @@ Following the things you need to do:
 - [ ] provide a val which returns `Expect<T>` in xYExpectations.kt (see yzExpectations.kt as a guideline)
 - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect<AB>` in xyExpectations.kt (see yzExpectations.kt as a guideline)
 - [ ] add `@since 0.19.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC
-- [ ] extend or write a separate Spec named XyExpectationsSpec in specs-common (see for instance YzExpectationsSpec) and extend it in atrium-api-fluent-en_GB-common/src/test
+- [ ] extend or write a separate Spec named XyExpectationsSpec in specs -> commonMain  (see for instance YzExpectationsSpec) and extend it in atrium-api-fluent-en_GB -> commonTest
 
 *api-infix*
 - [ ] provide a val which returns `Expect<T>` in xYExpectations.kt(see yzExpectations.kt as a guideline)
 - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect<AB>` in xyExpectations.kt (see yzExpectations.kt as a guideline)
 - [ ] add `@since 0.19.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC
-- [ ] extend or write a separate Spec named XyExpectationsSpec in specs-common (see for instance YzExpectationsSpec) and extend it in atrium-api-infix-en_GB-common/src/test
+- [ ] extend or write a separate Spec named XyExpectationsSpec in specs -> commonMain  (see for instance YzExpectationsSpec) and extend it in atrium-api-infix-en_GB -> commonTest
 
 
 ## Non-Code related feature

README.md

@@ -204,7 +204,7 @@ dependencies {
 and for the aforementioned extensions:
 ```
 dependencies {
-    testImplementation("ch.tutteli.atrium:atrium-api-infix-en_GB-kotlin_1_3-js:$atriumVersion")
+    testImplementation("ch.tutteli.atrium:atrium-api-infix-en_GB-kotlin_1_3:$atriumVersion")
 }
 ```
 <hr/>
@@ -1773,7 +1773,7 @@ Have a look at [apis/differences.md](https://github.com/robstoll/atrium/tree/mai
 This site contains also a list of all APIs with links to their expectation function catalogs.
 
 You can also have a look at the 
-[specifications](https://github.com/robstoll/atrium/tree/main/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs) 
+[specifications](https://github.com/robstoll/atrium/tree/main/misc/atrium-specs/src/commonMain/kotlin/ch/tutteli/atrium/specs) 
 for more examples.
 
 ## Sample Projects
@@ -2350,7 +2350,7 @@ Following a quick overview what extension methods could be useful:
 - all expectation functions on the logic level (what you have seen in [Compose expectation functions](#compose-expectation-functions) 
 was the API level) so that you can reuse and compose them in other ways.
 - `changeSubject` which allows to change the subject either:
-   - `unreported`; meaning it does not show up in reporting (e.g. `Expect<Array<out T>>.asList()` uses it, see [arrayAssertions](https://github.com/robstoll/atrium/tree/main/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arraySubjectChangers.kt#L20))
+   - `unreported`; meaning it does not show up in reporting (e.g. `Expect<Array<out T>>.asList()` uses it, see [arrayAssertions](https://github.com/robstoll/atrium/tree/main/apis/fluent-en_GB/atrium-api-fluent-en_GB/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/arraySubjectChangers.kt#L20))
    - reported, using `reportBuilder`; meaning a subject transformation which is shown in reporting as it incorporates a transformation (e.g. `toBeAnInstanceOf` uses it, see [AnyAssertions](https://github.com/robstoll/atrium/tree/main/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultAnyAssertions.kt#L66))
 - `collect` which allows to collect expectations - especially helpful in composing expectations (see [mapAssertions](https://github.com/robstoll/atrium/tree/main/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultMapAssertions.kt#L49))
 - `extractFeature` for feature extraction where it is not always save to extract (see [`List.get`](https://github.com/robstoll/atrium/tree/main/logic/atrium-logic-common/src/main/kotlin/ch/tutteli/atrium/logic/impl/DefaultListAssertions.kt#L13))   

apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureWorstCaseTest.kt

@@ -3,12 +3,13 @@
 package ch.tutteli.atrium.api.fluent.en_GB
 
 import ch.tutteli.atrium.api.verbs.internal.expect
-import kotlin.js.JsName
+//TODO 0.19.0 we are in a common module but it fails. Check if it does not if we use the default src layout
+//import kotlin.js.JsName
 
 class WorstCase {
 
     val propAndFun: Int = 1
-    @JsName("propFun")
+//    @JsName("propFun")
     fun propAndFun(): Int = 1
 
     fun overloaded(): Int = 1

apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/OptionalExpectationSamples.kt

@@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.fluent.en_GB.samples
 
 import ch.tutteli.atrium.api.fluent.en_GB.*
 import ch.tutteli.atrium.api.verbs.internal.expect
-import org.junit.jupiter.api.Test
 import java.util.*
+import kotlin.test.Test
 
 class OptionalExpectationSamples {
 

apis/fluent-en_GB/atrium-api-fluent-en_GB/build.gradle.kts

@@ -0,0 +1,38 @@
+description = "A fluent expectation function API in en_GB with a focus on code completion"
+
+val niokVersion: String by rootProject.extra
+
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(prefixedProject("logic"))
+            }
+        }
+
+        val jvmMain by getting {
+            dependencies {
+                implementation("ch.tutteli.niok:niok:$niokVersion")
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(prefixedProject("specs"))
+            }
+        }
+        val jvmTest by getting {
+            dependencies {
+                implementation(prefixedProject("specs"))
+            }
+        }
+    }
+}
+
+val jacocoAdditional: List<Project> by extra(
+    listOf(
+        prefixedProject("translations-en_GB"),
+        prefixedProject("logic"),
+        prefixedProject("core")
+    )
+)

apis/fluent-en_GB/extensions/atrium-api-fluent-en_GB-kotlin_1_3/build.gradle.kts

@@ -0,0 +1,30 @@
+description = "Kotlin 1.3 specific expectation functions and builders for atrium-api-fluent-en_GB -- will be merged into fluent-en_GB with 1.0.0 at the latest"
+
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(prefixedProject("api-fluent-en_GB"))
+                api(prefixedProject("logic-kotlin_1_3"))
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(prefixedProject("specs"))
+            }
+        }
+        val jvmTest by getting {
+            dependencies {
+                implementation(prefixedProject("specs"))
+            }
+        }
+
+        configureEach {
+            languageSettings.apply {
+                languageVersion = "1.3"
+                apiVersion = "1.3"
+            }
+        }
+    }
+}

apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FeatureWorstCaseTest.kt

@@ -3,12 +3,13 @@
 package ch.tutteli.atrium.api.infix.en_GB
 
 import ch.tutteli.atrium.api.verbs.internal.expect
-import kotlin.js.JsName
+//TODO 0.19.0 complains we are not in common module but we are. Check if error disappears once we use the default src folder
+//import kotlin.js.JsName
 
 class WorstCase {
 
     val propAndFun: Int = 1
-    @JsName("propFun")
+//    @JsName("propFun")
     fun propAndFun(): Int = 1
 
     fun overloaded(): Int = 1

apis/infix-en_GB/atrium-api-infix-en_GB/build.gradle.kts

@@ -0,0 +1,43 @@
+description = "An infix API in en_GB with a focus on code completion."
+
+val niokVersion: String by rootProject.extra
+
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(prefixedProject("logic"))
+            }
+        }
+
+        val jvmMain by getting {
+            dependencies {
+                implementation("ch.tutteli.niok:niok:$niokVersion")
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(project(":${rootProject.name}-specs")) {
+                    exclude(module = "${rootProject.name}-translations-en_GB")
+                }
+                implementation(prefixedProject("translations-de_CH"))
+            }
+        }
+        val jvmTest by getting {
+            dependencies {
+                implementation(project(":${rootProject.name}-specs")) {
+                    exclude(module = "${rootProject.name}-translations-en_GB")
+                }
+            }
+        }
+    }
+}
+
+val jacocoAdditional: List<Project> by extra(
+    listOf(
+        prefixedProject("translations-en_GB"),
+        prefixedProject("logic"),
+        prefixedProject("core")
+    )
+)

apis/infix-en_GB/extensions/atrium-api-infix-en_GB-kotlin_1_3/build.gradle.kts

@@ -0,0 +1,30 @@
+description = "Kotlin 1.3 specific expectation functions and builders for atrium-api-fluent-en_GB -- will be merged into fluent-en_GB with 1.0.0 at the latest"
+
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(prefixedProject("api-infix-en_GB"))
+                api(prefixedProject("logic-kotlin_1_3"))
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(prefixedProject("specs"))
+            }
+        }
+        val jvmTest by getting {
+            dependencies {
+                implementation(prefixedProject("specs"))
+            }
+        }
+
+        configureEach {
+            languageSettings.apply {
+                languageVersion = "1.3"
+                apiVersion = "1.3"
+            }
+        }
+    }
+}

atrium-core/build.gradle.kts

@@ -11,8 +11,8 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(prefixedProject("api-infix-en_GB-common"))
-                implementation(prefixedProject("specs-common"))
+                implementation(prefixedProject("api-infix-en_GB"))
+                implementation(prefixedProject("specs"))
             }
         }
         val jvmMain by getting {
@@ -22,8 +22,8 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(prefixedProject("api-infix-en_GB-jvm"))
-                implementation(prefixedProject("specs-jvm"))
+                implementation(prefixedProject("api-infix-en_GB"))
+                implementation(prefixedProject("specs"))
             }
         }
         //TODO 0.19.0 activate again as soon as api-infix has a js module
@@ -34,8 +34,8 @@ kotlin {
 //        }
 //        val jsTest by getting {
 //            dependencies {
-//                implementation(prefixedProject("api-infix-en_GB-js"))
-//                implementation(prefixedProject("specs-js"))
+//                implementation(prefixedProject("api-infix-en_GB"))
+//                implementation(prefixedProject("specs"))
 //            }
 //        }
     }