Merge pull request #61 from mpetuska/master

Kotlin 1.4.0-rc & build.gradle to kts

Author: patjackson52

build.gradle

@@ -0,0 +1,38 @@
+buildscript {
+  repositories {
+    google()
+    mavenCentral()
+    maven("https://dl.bintray.com/jetbrains/kotlin-native-dependencies")
+    maven("https://plugins.gradle.org/m2/")
+    maven("https://oss.sonatype.org/content/repositories/snapshots")
+    jcenter()
+  }
+
+  dependencies {
+    classpath(Plugins.kotlin)
+    classpath(Plugins.dokka)
+    classpath(Plugins.android)
+    classpath(Plugins.atomicFu)
+  }
+}
+
+plugins {
+  id("de.fayard.buildSrcVersions") version "0.4.2"
+}
+
+allprojects {
+  repositories {
+    google()
+    jcenter()
+    maven("https://kotlin.bintray.com/kotlinx")
+    maven("https://oss.sonatype.org/content/repositories/snapshots")
+    maven("https://dl.bintray.com/spekframework/spek-dev")
+    mavenCentral()
+  }
+
+  group = project.properties["GROUP"]!!
+  version = project.properties["VERSION_NAME"]!!
+  if (hasProperty("SNAPSHOT") || System.getenv("SNAPSHOT") != null) {
+    version = "$version-SNAPSHOT"
+  }
+}

build.gradle.kts

@@ -181,10 +181,10 @@ object Libs {
   const val spek_runner_junit5: String = "org.spekframework.spek2:spek-runner-junit5:" +
       Versions.spek
 
-  const val kotlin_coroutines: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:" +
+  const val kotlin_coroutines: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
           Versions.coroutines
 
-  const val kotlin_coroutines_jvm: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
+  const val kotlin_coroutines_jvm: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" +
           Versions.coroutines
 
   const val kotlin_coroutines_test: String =  "org.jetbrains.kotlinx:kotlinx-coroutines-test:" +

buildSrc/src/main/kotlin/Libs.kt

@@ -34,7 +34,7 @@ object Versions {
 
   const val dokka_gradle_plugin: String = "0.9.17" // available: "0.9.18"
 
-  const val org_jetbrains_kotlin: String = "1.3.72"
+  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"
@@ -43,9 +43,9 @@ object Versions {
 
   const val recycler_view = "1.0.0"
 
-  const val coroutines = "1.3.7"
+  const val coroutines = "1.3.8-1.4.0-rc"
 
-  const val atomicFu = "0.14.2"
+  const val atomicFu = "0.14.3-1.4.0-rc"
 
   /**
    *

buildSrc/src/main/kotlin/Versions.kt

@@ -0,0 +1,84 @@
+plugins {
+  java
+  kotlin("multiplatform")
+}
+
+repositories {
+  maven("https://dl.bintray.com/spekframework/spek-dev")
+}
+
+kotlin {
+  jvm()
+  js(IR) {
+    browser()
+    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"))
+      }
+    }
+    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")
+    }
+  }
+}