aboutsummaryrefslogtreecommitdiff
path: root/reactive
diff options
context:
space:
mode:
authorVsevolod Tolstopyatov <qwwdfsad@gmail.com>2020-10-05 10:07:06 -0700
committerGitHub <noreply@github.com>2020-10-05 20:07:06 +0300
commit3af136f9452ac5ff1c22657265d4b9e5e508ab71 (patch)
treeba19ec3433f3221096eba5824e3d303906e501ff /reactive
parentd2ed1d809805d9eadd8e8379427971f0e14380ce (diff)
downloadkotlinx.coroutines-3af136f9452ac5ff1c22657265d4b9e5e508ab71.tar.gz
Kts transition (#2261)
* Kotlin DSL - 'reactive:reactor' * Kotlin DSL - 'reactive:jdk9' * Kotlin DSL - 'kotlinx-coroutines-slf4j' * Kotlin DSL - 'kotlinx-coroutines-guava' * Plugin repo management in 'pluginManagement' block * Remove redundant stdlib dependencies (#2253) Co-authored-by: Victor Turansky <victor.turansky@gmail.com>
Diffstat (limited to 'reactive')
-rw-r--r--reactive/kotlinx-coroutines-jdk9/build.gradle24
-rw-r--r--reactive/kotlinx-coroutines-jdk9/build.gradle.kts22
-rw-r--r--reactive/kotlinx-coroutines-reactor/build.gradle23
-rw-r--r--reactive/kotlinx-coroutines-reactor/build.gradle.kts25
4 files changed, 47 insertions, 47 deletions
diff --git a/reactive/kotlinx-coroutines-jdk9/build.gradle b/reactive/kotlinx-coroutines-jdk9/build.gradle
deleted file mode 100644
index 8737e8ed..00000000
--- a/reactive/kotlinx-coroutines-jdk9/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-targetCompatibility = 9
-
-dependencies {
- compile project(":kotlinx-coroutines-reactive")
- compile "org.reactivestreams:reactive-streams-flow-adapters:$reactive_streams_version"
-}
-
-compileTestKotlin {
- kotlinOptions.jvmTarget = "9"
-}
-
-compileKotlin {
- kotlinOptions.jvmTarget = "9"
-}
-
-tasks.withType(dokka.getClass()) {
- externalDocumentationLink {
- url = new URL("https://docs.oracle.com/javase/9/docs/api/java/util/concurrent/Flow.html")
- packageListUrl = projectDir.toPath().resolve("package.list").toUri().toURL()
- }
-}
diff --git a/reactive/kotlinx-coroutines-jdk9/build.gradle.kts b/reactive/kotlinx-coroutines-jdk9/build.gradle.kts
new file mode 100644
index 00000000..c721746f
--- /dev/null
+++ b/reactive/kotlinx-coroutines-jdk9/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+dependencies {
+ compile(project(":kotlinx-coroutines-reactive"))
+ compile("org.reactivestreams:reactive-streams-flow-adapters:${version("reactive_streams")}")
+}
+
+tasks {
+ compileKotlin {
+ kotlinOptions.jvmTarget = "9"
+ }
+
+ compileTestKotlin {
+ kotlinOptions.jvmTarget = "9"
+ }
+}
+
+externalDocumentationLink(
+ url = "https://docs.oracle.com/javase/9/docs/api/java/util/concurrent/Flow.html"
+)
diff --git a/reactive/kotlinx-coroutines-reactor/build.gradle b/reactive/kotlinx-coroutines-reactor/build.gradle
deleted file mode 100644
index 3b640bd5..00000000
--- a/reactive/kotlinx-coroutines-reactor/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-
-dependencies {
- compile "io.projectreactor:reactor-core:$reactor_version"
- compile project(':kotlinx-coroutines-reactive')
-}
-
-tasks.withType(dokka.getClass()) {
- externalDocumentationLink {
- url = new URL("https://projectreactor.io/docs/core/$reactor_version/api/")
- packageListUrl = projectDir.toPath().resolve("package.list").toUri().toURL()
- }
-}
-
-compileTestKotlin {
- kotlinOptions.jvmTarget = "1.8"
-}
-
-compileKotlin {
- kotlinOptions.jvmTarget = "1.8"
-}
diff --git a/reactive/kotlinx-coroutines-reactor/build.gradle.kts b/reactive/kotlinx-coroutines-reactor/build.gradle.kts
new file mode 100644
index 00000000..d5fd208a
--- /dev/null
+++ b/reactive/kotlinx-coroutines-reactor/build.gradle.kts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+val reactorVersion = version("reactor")
+
+dependencies {
+ compile("io.projectreactor:reactor-core:$reactorVersion")
+ compile(project(":kotlinx-coroutines-reactive"))
+}
+
+
+tasks {
+ compileKotlin {
+ kotlinOptions.jvmTarget = "1.8"
+ }
+
+ compileTestKotlin {
+ kotlinOptions.jvmTarget = "1.8"
+ }
+}
+
+externalDocumentationLink(
+ url = "https://projectreactor.io/docs/core/$reactorVersion/api/"
+)