aboutsummaryrefslogtreecommitdiff
path: root/reactive
diff options
context:
space:
mode:
authorVsevolod Tolstopyatov <qwwdfsad@gmail.com>2020-04-29 23:35:41 +0300
committerGitHub <noreply@github.com>2020-04-29 23:35:41 +0300
commit0f15812be017fac06e017a4008ba1cae0152c509 (patch)
tree1b5b16834d4adc63b06c184adb7387d38ac42487 /reactive
parent8d6e464a3af47ae0b45a5c07acc4358ad8e3fd1f (diff)
downloadkotlinx.coroutines-0f15812be017fac06e017a4008ba1cae0152c509.tar.gz
Kts transition (#1951)
* Kotlin DSL - 'android:example-app' (#1940) * 'android:example-app'. Gradle 5.6.1 - sync with root project * Kotlin DSL - 'android:example-app' * Kotlin DSL - 'android:animation-app' (#1941) * 'android:animation-app'. Gradle 5.6.1 - sync with root project * Kotlin DSL - 'android:animation-app' * Kotlin DSL - 'swing' (#1943) * Kotlin DSL - 'integration:jdk8' (#1944) * Kotlin DSL - 'test' (#1945) * Kotlin DSL - 'reactive:reactive' (#1946) * Kotlin DSL - 'android-unit-tests' * Use relative paths * Kotlin DSL - 'js-stub' (#1938) (#1959) * Kotlin DSL - 'android' (#1938) (#1956) * Kotlin DSL - 'stdlib-stubs' (#1938) (#1955) * Kotlin DSL - 'site' (#1938) (#1954) * Kotlin DSL - 'maven-central' (#1938) (#1953) * Kotlin DSL - 'benchmarks' (#1938) (#1952) Co-authored-by: Victor Turansky <victor.turansky@gmail.com>
Diffstat (limited to 'reactive')
-rw-r--r--reactive/kotlinx-coroutines-reactive/build.gradle34
-rw-r--r--reactive/kotlinx-coroutines-reactive/build.gradle.kts43
2 files changed, 43 insertions, 34 deletions
diff --git a/reactive/kotlinx-coroutines-reactive/build.gradle b/reactive/kotlinx-coroutines-reactive/build.gradle
deleted file mode 100644
index ad97c63f..00000000
--- a/reactive/kotlinx-coroutines-reactive/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-
-dependencies {
- compile "org.reactivestreams:reactive-streams:$reactive_streams_version"
- testCompile "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"
-}
-
-task testNG(type: Test) {
- useTestNG()
- reports.html.destination = file("$buildDir/reports/testng")
- include '**/*ReactiveStreamTckTest.*'
- // Skip testNG when tests are filtered with --tests, otherwise it simply fails
- onlyIf {
- filter.includePatterns.isEmpty()
- }
- doFirst {
- // Classic gradle, nothing works without doFirst
- println "TestNG tests: ($includes)"
- }
-}
-
-test {
- dependsOn(testNG)
- reports.html.destination = file("$buildDir/reports/junit")
-}
-
-tasks.withType(dokka.getClass()) {
- externalDocumentationLink {
- url = new URL("https://www.reactive-streams.org/reactive-streams-$reactive_streams_version-javadoc/")
- packageListUrl = projectDir.toPath().resolve("package.list").toUri().toURL()
- }
-}
diff --git a/reactive/kotlinx-coroutines-reactive/build.gradle.kts b/reactive/kotlinx-coroutines-reactive/build.gradle.kts
new file mode 100644
index 00000000..c69148fe
--- /dev/null
+++ b/reactive/kotlinx-coroutines-reactive/build.gradle.kts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import org.jetbrains.dokka.DokkaConfiguration.ExternalDocumentationLink
+import org.jetbrains.dokka.gradle.DokkaTask
+import java.net.URL
+
+val reactiveStreamsVersion = property("reactive_streams_version")
+
+dependencies {
+ compile("org.reactivestreams:reactive-streams:$reactiveStreamsVersion")
+ testCompile("org.reactivestreams:reactive-streams-tck:$reactiveStreamsVersion")
+}
+
+tasks {
+ val testNG = register<Test>("testNG") {
+ useTestNG()
+ reports.html.destination = file("$buildDir/reports/testng")
+ include("**/*ReactiveStreamTckTest.*")
+ // Skip testNG when tests are filtered with --tests, otherwise it simply fails
+ onlyIf {
+ filter.includePatterns.isEmpty()
+ }
+ doFirst {
+ // Classic gradle, nothing works without doFirst
+ println("TestNG tests: ($includes)")
+ }
+ }
+
+ named<Test>("test") {
+ reports.html.destination = file("$buildDir/reports/junit")
+
+ dependsOn(testNG)
+ }
+
+ withType<DokkaTask>().configureEach {
+ externalDocumentationLink(delegateClosureOf<ExternalDocumentationLink.Builder> {
+ url = URL("https://www.reactive-streams.org/reactive-streams-$reactiveStreamsVersion-javadoc/")
+ packageListUrl = projectDir.toPath().resolve("package.list").toUri().toURL()
+ })
+ }
+}