Introduce coroutines, update deps

neonailol · Jun 25, 2018 · bb886d7 · bb886d7
1 parent 2674f5d
commit bb886d7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/build.cactoos.gradle.kts b/build.cactoos.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     "compile"("org.llorllale:cactoos-matchers:0.11")
     "compile"("org.takes:takes:1.11.3")
     "compile"("junit:junit:4.12") { exclude(module = "hamcrest-core") }
-    "compile"("org.mockito:mockito-core:2.18.3") { exclude(module = "hamcrest-core") }
+    "compile"("org.mockito:mockito-core:2.19.0") { exclude(module = "hamcrest-core") }
     "compile"("org.hamcrest:hamcrest-library:1.3")
     "compile"("org.hamcrest:hamcrest-core:1.3")
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.kotlin.dsl.kotlin
 plugins {
     base
     maven
-    id("com.github.ben-manes.versions") version "0.17.0"
+    id("com.github.ben-manes.versions") version "0.20.0"
 }
 
 buildscript {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.2.41"
+    kotlin("jvm") version "1.2.50"
 //    `embedded-kotlin` version "0.16.2"
 //    `kotlin-dsl` version "0.16.2"
 }
diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt
@@ -4,10 +4,20 @@ private object Versions {
     const val kotlin = "1.2.50"
     const val testng = "6.14.3"
     const val assertj = "3.10.0"
+    const val atomicfu = "0.10.3"
+    const val coroutines = "0.23.3"
 }
 
 fun kotlinVersion(): Any = Versions.kotlin
 
 fun DependencyHandler.testng(): Any = "org.testng:testng:${Versions.testng}"
 
 fun DependencyHandler.assertj(): Any = "org.assertj:assertj-core:${Versions.assertj}"
+
+fun DependencyHandler.`atomicfu-common`(): Any = "org.jetbrains.kotlinx:atomicfu-common:${Versions.atomicfu}"
+fun DependencyHandler.`atomicfu-js`(): Any = "org.jetbrains.kotlinx:atomicfu-js:${Versions.atomicfu}"
+fun DependencyHandler.`atomicfu-jvm`(): Any = "org.jetbrains.kotlinx:atomicfu:${Versions.atomicfu}"
+
+fun DependencyHandler.`coroutines-common`(): Any = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.coroutines}"
+fun DependencyHandler.`coroutines-js`(): Any = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Versions.coroutines}"
+fun DependencyHandler.`coroutines-jvm`(): Any = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
diff --git a/kactoos-common/build.gradle.kts b/kactoos-common/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
 
 dependencies {
     compile(kotlin("stdlib-common"))
+    compile(`atomicfu-common`())
+    compile(`coroutines-common`())
     testCompile(kotlin("test-common"))
     testCompile(kotlin("test-annotations-common"))
 }
diff --git a/kactoos-js/build.gradle.kts b/kactoos-js/build.gradle.kts
@@ -5,19 +5,21 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 
 plugins {
     id("kotlin-platform-js")
-    id("com.liferay.node") version "4.3.5"
+    id("com.liferay.node") version "4.4.0"
 }
 
 dependencies {
     expectedBy(project(":kactoos-common"))
     implementation(kotlin("stdlib-js"))
+    implementation(`atomicfu-jvm`())
+    implementation(`coroutines-jvm`())
     testCompile(kotlin("test-js"))
 }
 
 configurations {
     node {
         isDownload = true
-        setNodeVersion("10.4.1")
+        setNodeVersion("10.5.0")
     }
 }
 

diff --git a/kactoos-jvm/build.gradle.kts b/kactoos-jvm/build.gradle.kts
@@ -10,15 +10,17 @@ plugins {
     id("kotlin-platform-jvm")
     id("org.jetbrains.dokka") version "0.9.17"
     id("io.gitlab.arturbosch.detekt") version "1.0.0.RC7-2"
-    id("org.jlleitschuh.gradle.ktlint") version "4.0.0"
+    id("org.jlleitschuh.gradle.ktlint") version "4.1.0"
 }
 
 dependencies {
-    "expectedBy"(project(":kactoos-common"))
-    "implementation"(kotlin("stdlib-jdk8"))
-    "testCompile"(kotlin("test-testng"))
+    expectedBy(project(":kactoos-common"))
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(`atomicfu-jvm`())
+    implementation(`coroutines-jvm`())
+    testCompile(kotlin("test-testng"))
     testCompile(testng())
-    "testCompile"(assertj())
+    testCompile(assertj())
 }
 
 configurations {
@@ -34,7 +36,7 @@ configurations {
     }
 
     ktlint {
-        version = "0.23.1"
+        version = "0.24.0"
         debug = true
         verbose = true
         android = false