Merge pull request #62 from reduxkotlin/feature/59-add-platforms

[#59] add missing platforms & remove spek & atrium

Author: patjackson52

.github/workflows/test.yml

@@ -8,12 +8,15 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v2
 
       - name: Test
-        run: ./gradlew jvmTest
+        run: ./gradlew allTest
 
       - name: Archive redux-kotlin Test Reports
         uses: actions/upload-artifact@v1

build.gradle.kts

@@ -26,7 +26,6 @@ allprojects {
     jcenter()
     maven("https://kotlin.bintray.com/kotlinx")
     maven("https://oss.sonatype.org/content/repositories/snapshots")
-    maven("https://dl.bintray.com/spekframework/spek-dev")
     mavenCentral()
   }
 

buildSrc/src/main/kotlin/Libs.kt

@@ -8,41 +8,20 @@ import kotlin.String
  */
 object Libs {
   /**
-   * http://developer.android.com/tools/extras/support-library.html
+   * https://developer.android.com/jetpack/androidx
    */
   const val appcompat: String = "androidx.appcompat:appcompat:" + Versions.appcompat
 
   /**
-   * https://developer.android.com/reference/android/support/constraint/ConstraintLayout
+   * http://tools.android.com
    */
-  const val constraintLayout = "androidx.constraintlayout:constraintlayout:" + Versions.constraint_layout
+  const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:" +
+      Versions.constraintlayout
 
   /**
-   * https://developer.android.com/guide/topics/ui/layout/recyclerview
+   * https://developer.android.com/jetpack/androidx
    */
-  const val recyclerView = "androidx.recyclerview:recyclerview:" + Versions.recycler_view
-
-  /**
-   * https://developer.android.com/testing
-   */
-  const val espresso_core: String = "androidx.test.espresso:espresso-core:" + Versions.espresso_core
-
-  /**
-   * https://developer.android.com/testing
-   */
-  const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner
-
-  /**
-   * https://github.com/robstoll/atrium
-   */
-  const val atrium_cc_en_gb_robstoll_common: String =
-      "ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:" + Versions.atrium
-
-  /**
-   * https://github.com/robstoll/atrium
-   */
-  const val atrium_cc_en_gb_robstoll: String = "ch.tutteli.atrium:atrium-cc-en_GB-robstoll:" +
-      Versions.atrium
+  const val recyclerview: String = "androidx.recyclerview:recyclerview:" + Versions.recyclerview
 
   /**
    * https://developer.android.com/studio
@@ -67,17 +46,12 @@ object Libs {
   /**
    * http://mockk.io
    */
-  const val mockk_common: String = "io.mockk:mockk-common:" + Versions.mockk
+  const val mockk_common: String = "io.mockk:mockk-common:" + Versions.io_mockk
 
   /**
    * http://mockk.io
    */
-  const val mockk: String = "io.mockk:mockk:" + Versions.mockk
-
-  /**
-   * http://junit.org
-   */
-  const val junit: String = "junit:junit:" + Versions.junit
+  const val mockk: String = "io.mockk:mockk:" + Versions.io_mockk
 
   const val dokka_gradle_plugin: String = "org.jetbrains.dokka:dokka-gradle-plugin:" +
       Versions.dokka_gradle_plugin
@@ -100,12 +74,18 @@ object Libs {
   const val kotlin_annotation_processing_gradle: String =
       "org.jetbrains.kotlin:kotlin-annotation-processing-gradle:" + Versions.org_jetbrains_kotlin
 
+  const val kotlin_compiler_embeddable: String =
+      "org.jetbrains.kotlin:kotlin-compiler-embeddable:" + Versions.org_jetbrains_kotlin
+
   /**
    * https://kotlinlang.org/
    */
   const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
       Versions.org_jetbrains_kotlin
 
+  const val kotlin_klib_commonizer_embeddable: String =
+      "org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:" + Versions.org_jetbrains_kotlin
+
   /**
    * https://kotlinlang.org/
    */
@@ -119,7 +99,7 @@ object Libs {
       "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin
 
   /**
-   * https://kotlinlang.org/
+   * 1.3.72
    */
   const val kotlin_stdlib_common: String = "org.jetbrains.kotlin:kotlin-stdlib-common:" +
       Versions.org_jetbrains_kotlin
@@ -131,13 +111,13 @@ object Libs {
       Versions.org_jetbrains_kotlin
 
   /**
-   * https://kotlinlang.org/
+   * 1.3.72
    */
   const val kotlin_stdlib_js: String = "org.jetbrains.kotlin:kotlin-stdlib-js:" +
       Versions.org_jetbrains_kotlin
 
   /**
-   * https://kotlinlang.org/
+   * 1.3.72
    */
   const val kotlin_stdlib: String = "org.jetbrains.kotlin:kotlin-stdlib:" +
       Versions.org_jetbrains_kotlin
@@ -172,21 +152,32 @@ object Libs {
   const val kotlin_test: String = "org.jetbrains.kotlin:kotlin-test:" +
       Versions.org_jetbrains_kotlin
 
-  const val spek_dsl_jvm: String = "org.spekframework.spek2:spek-dsl-jvm:" +
-      Versions.spek
-
-  const val spek_dsl_metadata: String = "org.spekframework.spek2:spek-dsl-metadata:" +
-      Versions.spek
+  /**
+   * https://github.com/Kotlin/atomicfu
+   */
+  const val atomicfu_gradle_plugin: String = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:" +
+      Versions.atomicfu_gradle_plugin
 
-  const val spek_runner_junit5: String = "org.spekframework.spek2:spek-runner-junit5:" +
-      Versions.spek
+  /**
+   * https://github.com/Kotlin/atomicfu
+   */
+  const val atomicfu: String = "org.jetbrains.kotlinx:atomicfu:" + Versions.atomicfu
 
-  const val kotlin_coroutines: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
-          Versions.coroutines
+  /**
+   * https://github.com/Kotlin/kotlinx.coroutines
+   */
+  const val kotlinx_coroutines_core_jvm: String =
+      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" + Versions.kotlinx_coroutines_core_jvm
 
-  const val kotlin_coroutines_jvm: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" +
-          Versions.coroutines
+  /**
+   * https://github.com/Kotlin/kotlinx.coroutines
+   */
+  const val kotlinx_coroutines_core: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
+      Versions.kotlinx_coroutines_core
 
-  const val kotlin_coroutines_test: String =  "org.jetbrains.kotlinx:kotlinx-coroutines-test:" +
-          Versions.coroutines
+  /**
+   * https://github.com/Kotlin/kotlinx.coroutines
+   */
+  const val kotlinx_coroutines_test: String = "org.jetbrains.kotlinx:kotlinx-coroutines-test:" +
+      Versions.kotlinx_coroutines_test
 }

buildSrc/src/main/kotlin/Plugins.kt

@@ -2,5 +2,5 @@ object Plugins {
     const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
     const val dokka  = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
     const val android = "com.android.tools.build:gradle:${Versions.com_android_tools_build_gradle}"
-    const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Versions.atomicFu}"
+    const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Versions.atomicfu}"
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -12,49 +12,44 @@ import org.gradle.plugin.use.PluginDependencySpec
  * YOU are responsible for updating manually the dependency version.
  */
 object Versions {
-  const val appcompat: String = "1.1.0-rc01"
+  const val appcompat: String = "1.1.0-rc01" // available: "1.1.0"
 
-  const val espresso_core: String = "3.2.0"
+  const val constraintlayout: String = "1.1.3"
 
-  const val androidx_test_runner: String = "1.2.0"
+  const val recyclerview: String = "1.0.0" // available: "1.1.0"
 
-  const val atrium: String = "0.9.2"
+  const val aapt2: String = "3.6.0-6040484" // available: "4.0.1-6197926"
 
-  const val aapt2: String = "3.5.0-5435860"
+  const val com_android_tools_build_gradle: String = "3.6.0" // available: "4.0.1"
 
-  const val com_android_tools_build_gradle: String = "3.6.0"
+  const val lint_gradle: String = "26.6.0" // available: "27.0.1"
 
-  const val lint_gradle: String = "26.5.0"
+  const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2" // available: "0.7.0"
 
-  const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2"
+  const val io_mockk: String = "1.9.3" // available: "1.10.0"
 
-  const val mockk: String = "1.9.3"
-
-  const val junit: String = "4.12"
-
-  const val dokka_gradle_plugin: String = "0.9.17" // available: "0.9.18"
+  const val dokka_gradle_plugin: String = "0.9.17" // available: "0.11.0-dev-59"
 
   const val org_jetbrains_kotlin: String = "1.4.0-rc"
 
-  const val spek: String = "2.1.0-alpha.0.11+d97ef33"
-       // available: "2.1.0-alpha.0.24+0fdeb6e"
+  const val atomicfu_gradle_plugin: String = "0.14.3-1.4.0-rc"
 
-  const val constraint_layout = "1.1.3"
+  const val atomicfu: String = "0.14.3-1.4.0-rc"
 
-  const val recycler_view = "1.0.0"
+  const val kotlinx_coroutines_core_jvm: String = "1.3.8-1.4.0-rc"
 
-  const val coroutines = "1.3.8-1.4.0-rc"
+  const val kotlinx_coroutines_core: String = "1.3.8-1.4.0-rc"
 
-  const val atomicFu = "0.14.3-1.4.0-rc"
+  const val kotlinx_coroutines_test: String = "1.3.8-1.4.0-rc"
 
   /**
    *
    * See issue 19: How to update Gradle itself?
    * https://github.com/jmfayard/buildSrcVersions/issues/19
    */
-  const val gradleLatestVersion: String = "5.6.1"
+  const val gradleLatestVersion: String = "6.5.1"
 
-  const val gradleCurrentVersion: String = "5.6.1"
+  const val gradleCurrentVersion: String = "6.5"
 }
 
 /**

examples/counter/android/build.gradle.kts

@@ -34,7 +34,6 @@ android {
     }
 }
 
-
 dependencies {
     implementation(Libs.kotlin_stdlib_jdk8)
     implementation(Libs.appcompat)

examples/counter/common/build.gradle.kts

@@ -3,10 +3,6 @@ plugins {
   kotlin("multiplatform")
 }
 
-repositories {
-  maven("https://dl.bintray.com/spekframework/spek-dev")
-}
-
 kotlin {
   jvm()
   js(IR) {
@@ -23,15 +19,8 @@ kotlin {
     }
   }
 
-  iosArm64("ios")
-  iosX64("iosSim")
-  macosX64("macos")
-  mingwX64("win")
-  wasm32("wasm")
-  linuxArm32Hfp("linArm32")
-  linuxMips32("linMips32")
-  linuxMipsel32("linMipsel32")
-  linuxX64("lin64")
+  iosArm64()
+  iosX64()
 
   sourceSets {
     commonMain {
@@ -40,24 +29,16 @@ kotlin {
       }
     }
     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}")
+        implementation("io.mockk:mockk-common:${Versions.io_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")
       }
     }
@@ -67,18 +48,5 @@ kotlin {
         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")
-    }
   }
 }

examples/counter/common/src/test/kotlin/org/reduxkotlin/examples/counter/ReducerTest.kt

@@ -1,26 +1,22 @@
 package org.reduxkotlin.examples.counter
 
-import ch.tutteli.atrium.api.cc.en_GB.toBe
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
-import ch.tutteli.atrium.verbs.expect
+import kotlin.test.Test
+import kotlin.test.expect
 
+class CounterTest {
 
-object CounterSpek : Spek({
-
-    describe("reducers") {
-        describe("counter") {
-            it("should handle INCREMENT action") {
-                expect(reducer(1, Increment())).toBe(2)
-            }
+    @Test
+    fun shouldHandleINCREMENTAction() {
+        expect(2) { reducer(1, Increment()) }
+    }
 
-            it("should handle DECREMENT action") {
-                expect(reducer(1, Decrement())).toBe(0)
-            }
+    @Test
+    fun shouldHandleDECREMENTAction() {
+        expect(0) { reducer(1, Decrement()) }
+    }
 
-            it("should ignore unknown actions") {
-                expect(reducer(1, Any())).toBe(1)
-            }
-        }
+    @Test
+    fun shouldIgnoreUnknownActions() {
+        expect(1) { reducer(1, Any()) }
     }
-})
+}

examples/todos/android/build.gradle.kts

@@ -35,12 +35,11 @@ android {
     }
 }
 
-
 dependencies {
     implementation(Libs.kotlin_stdlib_jdk8)
     implementation(Libs.appcompat)
-    implementation(Libs.constraintLayout)
-    implementation(Libs.recyclerView)
+    implementation(Libs.constraintlayout)
+    implementation(Libs.recyclerview)
 
     implementation(project(":examples:todos:common"))
     implementation(project(":redux-kotlin-threadsafe"))