feature: remove experimental corountine APIs

uchuhimo · Oct 31, 2018 · 7713c3b · 7713c3b
1 parent 19d2d97
commit 7713c3b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,6 @@ import io.spring.gradle.dependencymanagement.dsl.DependencySetHandler
 import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.dokka.gradle.LinkMapping
-import org.jetbrains.kotlin.gradle.dsl.Coroutines
 import java.util.Properties
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URL
@@ -162,12 +161,6 @@ java {
     targetCompatibility = Versions.java
 }
 
-kotlin {
-    experimental {
-        coroutines = Coroutines.ENABLE
-    }
-}
-
 val test by tasks.existing(Test::class)
 test {
     useJUnitPlatform()

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -2,19 +2,19 @@ import org.gradle.api.JavaVersion
 
 object Versions {
     val java = JavaVersion.VERSION_1_8
-    val kotlin = "1.2.71"
-    val kotlinApi = "1.2"
-    val junit = "5.2.0"
-    val junitPlatform = "1.2.0"
-    val spek = "1.2.0"
+    val kotlin = "1.3.0"
+    val kotlinApi = "1.3"
+    val junit = "5.3.1"
+    val junitPlatform = "1.3.1"
+    val spek = "1.2.1"
     val jacksonMinor = "2.9"
     val jackson = "$jacksonMinor.6"
     val bintrayPlugin = "1.8.4"
     val bintrayRelease = "0.8.1"
     val taskTree = "1.3"
     val jmh = "1.21"
     val jmhPlugin = "0.4.7"
-    val spotless = "3.15.0"
+    val spotless = "3.16.0"
     val dependencyManagement = "1.0.6.RELEASE"
     val dependencyUpdate = "0.20.0"
     val dokka = "0.9.17"
@@ -24,7 +24,7 @@ object Versions {
     val yaml = "1.23"
     val toml4j = "0.7.2"
     val dom4j = "2.1.0"
-    val coroutines = "0.30.2"
+    val coroutines = "1.0.0"
     val jgit = "5.1.2.201810061102-r"
     val hamkrest = "1.6.0.0"
     val hamcrest = "1.3"

diff --git a/src/main/kotlin/com/uchuhimo/konf/source/DefaultLoaders.kt b/src/main/kotlin/com/uchuhimo/konf/source/DefaultLoaders.kt
@@ -28,13 +28,13 @@ import com.uchuhimo.konf.source.properties.PropertiesProvider
 import com.uchuhimo.konf.source.toml.TomlProvider
 import com.uchuhimo.konf.source.xml.XmlProvider
 import com.uchuhimo.konf.source.yaml.YamlProvider
-import kotlinx.coroutines.experimental.Dispatchers
+import kotlinx.coroutines.Dispatchers
 import org.eclipse.jgit.api.TransportCommand
 import org.eclipse.jgit.lib.Constants
 import java.io.File
 import java.net.URL
 import java.util.concurrent.TimeUnit
-import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.CoroutineContext
 
 /**
  * Default loaders for config.

diff --git a/src/main/kotlin/com/uchuhimo/konf/source/Loader.kt b/src/main/kotlin/com/uchuhimo/konf/source/Loader.kt
@@ -17,10 +17,10 @@
 package com.uchuhimo.konf.source
 
 import com.uchuhimo.konf.Config
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.GlobalScope
-import kotlinx.coroutines.experimental.delay
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.eclipse.jgit.api.TransportCommand
 import org.eclipse.jgit.lib.Constants
 import java.io.File
@@ -32,7 +32,7 @@ import java.nio.file.Path
 import java.nio.file.StandardWatchEventKinds
 import java.nio.file.WatchEvent
 import java.util.concurrent.TimeUnit
-import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.CoroutineContext
 
 /**
  * Loader to load source from various input formats.

diff --git a/src/test/kotlin/com/uchuhimo/konf/source/DefaultLoadersSpec.kt b/src/test/kotlin/com/uchuhimo/konf/source/DefaultLoadersSpec.kt
@@ -23,9 +23,9 @@ import com.uchuhimo.konf.Config
 import com.uchuhimo.konf.ConfigSpec
 import com.uchuhimo.konf.source.properties.PropertiesProvider
 import com.uchuhimo.konf.tempFileOf
-import kotlinx.coroutines.experimental.delay
-import kotlinx.coroutines.experimental.newSingleThreadContext
-import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.runBlocking
 import org.eclipse.jgit.api.Git
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.given

diff --git a/src/test/kotlin/com/uchuhimo/konf/source/LoaderSpec.kt b/src/test/kotlin/com/uchuhimo/konf/source/LoaderSpec.kt
@@ -22,9 +22,9 @@ import com.natpryce.hamkrest.throws
 import com.uchuhimo.konf.Config
 import com.uchuhimo.konf.ConfigSpec
 import com.uchuhimo.konf.tempFileOf
-import kotlinx.coroutines.experimental.delay
-import kotlinx.coroutines.experimental.newSingleThreadContext
-import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.runBlocking
 import org.eclipse.jgit.api.Git
 import org.jetbrains.spek.api.dsl.given
 import org.jetbrains.spek.api.dsl.it