Kotlin 1.4.0-rc further cleanup

Martynas Petuška · Martynas Petuška · commit c3f63a0b63d8 · 2020-07-27T23:20:17.000+03:00
diff --git a/examples/todos/common/build.gradle b/examples/todos/common/build.gradle
diff --git a/examples/todos/common/build.gradle.kts b/examples/todos/common/build.gradle.kts
@@ -0,0 +1,83 @@
+plugins {
+    java
+    kotlin("multiplatform")
+}
+
+repositories {
+    maven("https://dl.bintray.com/spekframework/spek-dev")
+}
+
+kotlin {
+    jvm()
+    js(IR) {
+        binaries.executable()
+
+        listOf(compilations["main"], compilations["test"]).forEach {
+            with(it.kotlinOptions) {
+                moduleKind = "umd"
+                sourceMap = true
+                sourceMapEmbedSources = "always"
+                metaInfo = true
+            }
+        }
+    }
+
+    iosArm64("ios")
+    iosX64("iosSim")
+    macosX64("macos")
+    mingwX64("win")
+    wasm32("wasm")
+    linuxArm32Hfp("linArm32")
+    linuxMips32("linMips32")
+    linuxMipsel32("linMipsel32")
+    linuxX64("lin64")
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":redux-kotlin-threadsafe"))
+            }
+        }
+        commonTest {
+            kotlin.srcDir("src/test/kotlin")
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+                implementation("org.spekframework.spek2:spek-dsl-metadata:${Versions.spek}")
+                implementation("ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:${Versions.atrium}")
+                implementation("io.mockk:mockk-common:${Versions.mockk}")
+            }
+        }
+        val jvmTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+                implementation("org.spekframework.spek2:spek-dsl-jvm:${Versions.spek}")
+                implementation("ch.tutteli.atrium:atrium-cc-en_GB-robstoll:${Versions.atrium}")
+                implementation("io.mockk:mockk:${Versions.mockk}")
+
+                runtimeOnly("org.spekframework.spek2:spek-runner-junit5:${Versions.spek}")
+                runtimeOnly("org.jetbrains.kotlin:kotlin-reflect")
+            }
+        }
+        val jsTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+                implementation(kotlin("stdlib-js"))
+            }
+        }
+
+        val iosMain by getting
+        val iosTest by getting
+        val iosSimMain by getting { dependsOn(iosMain) }
+        val iosSimTest by getting { dependsOn(iosTest) }
+    }
+}
+
+tasks {
+    val jvmTest by getting(Test::class) {
+        useJUnitPlatform {
+            includeEngines("spek2")
+        }
+    }
+}
diff --git a/redux-kotlin-threadsafe/build.gradle.kts b/redux-kotlin-threadsafe/build.gradle.kts
@@ -39,7 +39,6 @@ kotlin {
       }
     }
     commonTest {
-      kotlin.srcDir("src/test/kotlin")
       dependencies {
         implementation(kotlin("test-common"))
         implementation(kotlin("test-annotations-common"))
diff --git a/redux-kotlin/build.gradle.kts b/redux-kotlin/build.gradle.kts
@@ -33,7 +33,6 @@ kotlin {
 
   sourceSets {
     commonTest {
-      kotlin.srcDir("src/test/kotlin")
       dependencies {
         implementation(kotlin("test-common"))
         implementation(kotlin("test-annotations-common"))
diff --git a/redux-kotlin/src/commonTest/kotlin/org/reduxkotlin/ApplyMiddlewareTest.kt b/redux-kotlin/src/commonTest/kotlin/org/reduxkotlin/ApplyMiddlewareTest.kt
@@ -1,7 +1,5 @@
 package org.reduxkotlin
 
-import ch.tutteli.atrium.api.cc.en_GB.toThrow
-import ch.tutteli.atrium.domain.creating.AnyAssertions
 import ch.tutteli.atrium.verbs.expect
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
@@ -11,7 +9,7 @@ object ApplyMiddlewareSpec : Spek({
     describe("applyMiddleware") {
         it("warns when dispatching during middleware setup") {
             fun dispatchingMiddleware(store: Store<TestState>): (next: Dispatcher) -> (action: Any) -> Any {
-                store.dispatch(AddTodo("1", "Dont dispatch in middleware setup"));
+                store.dispatch(AddTodo("1", "Dont dispatch in middleware setup"))
                 return { next ->
                     { action ->
                         {
@@ -24,7 +22,7 @@ object ApplyMiddlewareSpec : Spek({
             expect {
                 val storeEnhancer: StoreEnhancer<TestState> = applyMiddleware(::dispatchingMiddleware)
                 createStore(todos, TestState(), storeEnhancer)
-            }.toThrow<Exception> {}
+            }.toThrow<Exception>().asAssert({})
         }
 
         /*
diff --git a/redux-kotlin/src/commonTest/kotlin/org/reduxkotlin/CreateStoreSpec.kt b/redux-kotlin/src/commonTest/kotlin/org/reduxkotlin/CreateStoreSpec.kt
@@ -1,6 +1,9 @@
 package org.reduxkotlin
 
-import ch.tutteli.atrium.api.cc.en_GB.toBe
+import ch.tutteli.atrium.api.fluent.en_GB.toBe
+import ch.tutteli.atrium.creating.Assert
+import ch.tutteli.atrium.domain.builders.migration.asAssert
+import ch.tutteli.atrium.domain.builders.migration.asExpect
 import ch.tutteli.atrium.verbs.expect
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
@@ -19,7 +22,7 @@ object CreateStoreSpec : Spek({
                 )
             )
 
-            expect(store.getState()).toBe(
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(
                 TestState(
                     listOf(
                         Todo(
@@ -28,17 +31,17 @@ object CreateStoreSpec : Spek({
                         )
                     )
                 )
-            )
+            ).asAssert()
         }
         it("applies the reducer to the previous state") {
             val store = createStore(todos, TestState())
-            expect(store.getState()).toBe(TestState())
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(TestState()).asAssert()
 
             store.dispatch(Any())
-            expect(store.getState()).toBe(TestState())
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(TestState()).asAssert()
 
             store.dispatch(AddTodo("1", "Hello"))
-            expect(store.getState()).toBe(
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(
                 TestState(
                     listOf(
                         Todo(
@@ -47,11 +50,11 @@ object CreateStoreSpec : Spek({
                         )
                     )
                 )
-            )
+            ).asAssert()
 
             //TODO are ids autoincrement?
             store.dispatch(AddTodo("2", "World"))
-            expect(store.getState()).toBe(
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(
                 TestState(
                     listOf(
                         Todo(
@@ -64,7 +67,7 @@ object CreateStoreSpec : Spek({
                         )
                     )
                 )
-            )
+            ).asAssert()
         }
 
         it("applies the reducer to the initial state") {
@@ -78,7 +81,7 @@ object CreateStoreSpec : Spek({
                     )
                 )
             )
-            expect(store.getState()).toBe(
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(
                 TestState(
                     listOf(
                         Todo(
@@ -87,10 +90,10 @@ object CreateStoreSpec : Spek({
                         )
                     )
                 )
-            )
+            ).asAssert()
 
             store.dispatch(Any())
-            expect(store.getState()).toBe(
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(
                 TestState(
                     listOf(
                         Todo(
@@ -99,10 +102,10 @@ object CreateStoreSpec : Spek({
                         )
                     )
                 )
-            )
+            ).asAssert()
 
             store.dispatch(AddTodo("2", "World"))
-            expect(store.getState()).toBe(
+            expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(
                 TestState(
                     listOf(
                         Todo(
@@ -115,7 +118,7 @@ object CreateStoreSpec : Spek({
                         )
                     )
                 )
-            )
+            ).asAssert()
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ kotlin {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`commonTest {`
`42`		`- kotlin.srcDir("src/test/kotlin")`
`43`	`42`	`dependencies {`
`44`	`43`	`implementation(kotlin("test-common"))`
`45`	`44`	`implementation(kotlin("test-annotations-common"))`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`package org.reduxkotlin`
`2`	`2`
`3`		`-import ch.tutteli.atrium.api.cc.en_GB.toBe`
	`3`	`+import ch.tutteli.atrium.api.fluent.en_GB.toBe`
	`4`	`+import ch.tutteli.atrium.creating.Assert`
	`5`	`+import ch.tutteli.atrium.domain.builders.migration.asAssert`
	`6`	`+import ch.tutteli.atrium.domain.builders.migration.asExpect`
`4`	`7`	`import ch.tutteli.atrium.verbs.expect`
`5`	`8`	`import org.spekframework.spek2.Spek`
`6`	`9`	`import org.spekframework.spek2.style.specification.describe`
`@@ -19,7 +22,7 @@ object CreateStoreSpec : Spek({`
`19`	`22`	`)`
`20`	`23`	`)`
`21`	`24`
`22`		`- expect(store.getState()).toBe(`
	`25`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(`
`23`	`26`	`TestState(`
`24`	`27`	`listOf(`
`25`	`28`	`Todo(`
`@@ -28,17 +31,17 @@ object CreateStoreSpec : Spek({`
`28`	`31`	`)`
`29`	`32`	`)`
`30`	`33`	`)`
`31`		`- )`
	`34`	`+ ).asAssert()`
`32`	`35`	`}`
`33`	`36`	`it("applies the reducer to the previous state") {`
`34`	`37`	`val store = createStore(todos, TestState())`
`35`		`- expect(store.getState()).toBe(TestState())`
	`38`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(TestState()).asAssert()`
`36`	`39`
`37`	`40`	`store.dispatch(Any())`
`38`		`- expect(store.getState()).toBe(TestState())`
	`41`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(TestState()).asAssert()`
`39`	`42`
`40`	`43`	`store.dispatch(AddTodo("1", "Hello"))`
`41`		`- expect(store.getState()).toBe(`
	`44`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(`
`42`	`45`	`TestState(`
`43`	`46`	`listOf(`
`44`	`47`	`Todo(`
`@@ -47,11 +50,11 @@ object CreateStoreSpec : Spek({`
`47`	`50`	`)`
`48`	`51`	`)`
`49`	`52`	`)`
`50`		`- )`
	`53`	`+ ).asAssert()`
`51`	`54`
`52`	`55`	`//TODO are ids autoincrement?`
`53`	`56`	`store.dispatch(AddTodo("2", "World"))`
`54`		`- expect(store.getState()).toBe(`
	`57`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(`
`55`	`58`	`TestState(`
`56`	`59`	`listOf(`
`57`	`60`	`Todo(`
`@@ -64,7 +67,7 @@ object CreateStoreSpec : Spek({`
`64`	`67`	`)`
`65`	`68`	`)`
`66`	`69`	`)`
`67`		`- )`
	`70`	`+ ).asAssert()`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`it("applies the reducer to the initial state") {`
`@@ -78,7 +81,7 @@ object CreateStoreSpec : Spek({`
`78`	`81`	`)`
`79`	`82`	`)`
`80`	`83`	`)`
`81`		`- expect(store.getState()).toBe(`
	`84`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(`
`82`	`85`	`TestState(`
`83`	`86`	`listOf(`
`84`	`87`	`Todo(`
`@@ -87,10 +90,10 @@ object CreateStoreSpec : Spek({`
`87`	`90`	`)`
`88`	`91`	`)`
`89`	`92`	`)`
`90`		`- )`
	`93`	`+ ).asAssert()`
`91`	`94`
`92`	`95`	`store.dispatch(Any())`
`93`		`- expect(store.getState()).toBe(`
	`96`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(`
`94`	`97`	`TestState(`
`95`	`98`	`listOf(`
`96`	`99`	`Todo(`
`@@ -99,10 +102,10 @@ object CreateStoreSpec : Spek({`
`99`	`102`	`)`
`100`	`103`	`)`
`101`	`104`	`)`
`102`		`- )`
	`105`	`+ ).asAssert()`
`103`	`106`
`104`	`107`	`store.dispatch(AddTodo("2", "World"))`
`105`		`- expect(store.getState()).toBe(`
	`108`	`+ expect(store.getState()).asExpect<TestState, Assert<TestState>>().toBe(`
`106`	`109`	`TestState(`
`107`	`110`	`listOf(`
`108`	`111`	`Todo(`
`@@ -115,7 +118,7 @@ object CreateStoreSpec : Spek({`
`115`	`118`	`)`
`116`	`119`	`)`
`117`	`120`	`)`
`118`		`- )`
	`121`	`+ ).asAssert()`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`}`