Updated to kotlin version 1.1.0-rc
diff --git a/CHANGES.md b/CHANGES.md
index 6454eb8..fbbf77f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
# Change log for kotlinx.coroutines
+
+## Version 0.6-rc
+
+* Switched to Kotlin version 1.1.0-rc.
+
## Version 0.5-beta
* Switched to Kotlin version 1.1.0-beta-22 (republished version).
diff --git a/README.md b/README.md
index 5a10e8e..c274cab 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# kotlinx.coroutines
-Library support for Kotlin coroutines. This is a companion version for Kotlin 1.1.0-beta-22 release.
+Library support for Kotlin coroutines. This is a companion version for Kotlin 1.1.0-rc release.
## Modules and features
@@ -48,7 +48,7 @@
The libraries are published to [kotlin-eap-1.1](https://bintray.com/kotlin/kotlin-eap-1.1/kotlinx.coroutines) bintray repository.
-These libraries require kotlin compiler version to be at least `1.1-Beta` and
+These libraries require kotlin compiler version to be at least `1.1.0-rc` and
require kotlin runtime of the same version as a dependency, which can be obtained from the same repository.
### Maven
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
- <version>0.5-beta</version>
+ <version>0.6-rc</version>
</dependency>
```
@@ -81,7 +81,7 @@
```xml
<properties>
- <kotlin.version>1.1.0-beta-22</kotlin.version>
+ <kotlin.version>1.1.0-rc</kotlin.version>
</properties>
```
@@ -100,13 +100,13 @@
Add dependencies (you can also add other modules that you need):
```groovy
-compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.5-beta'
+compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.6-rc'
```
And make sure that you use the right Kotlin version:
```groovy
buildscript {
- ext.kotlin_version = '1.1.0-beta-22'
+ ext.kotlin_version = '1.1.0-rc'
}
```
diff --git a/kotlinx-coroutines-core/pom.xml b/kotlinx-coroutines-core/pom.xml
index 291cde9..ebece01 100644
--- a/kotlinx-coroutines-core/pom.xml
+++ b/kotlinx-coroutines-core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-core</artifactId>
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Builders.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Builders.kt
index 743d7d5..9a87ca5 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Builders.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Builders.kt
@@ -1,7 +1,7 @@
package kotlinx.coroutines.experimental
import java.util.concurrent.locks.LockSupport
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
// --------------- basic coroutine builders ---------------
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CancellableContinuation.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CancellableContinuation.kt
index 279315d..64d815b 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CancellableContinuation.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CancellableContinuation.kt
@@ -1,11 +1,11 @@
package kotlinx.coroutines.experimental
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.ContinuationInterceptor
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
-import kotlin.coroutines.suspendCoroutine
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.ContinuationInterceptor
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.suspendCoroutine
// --------------- cancellable continuations ---------------
@@ -68,8 +68,8 @@
fun getResult(): Any? {
val decision = this.decision // volatile read
when (decision) {
- UNDECIDED -> if (DECISION.compareAndSet(this, UNDECIDED, SUSPENDED)) return SUSPENDED_MARKER
- YIELD -> return SUSPENDED_MARKER
+ UNDECIDED -> if (DECISION.compareAndSet(this, UNDECIDED, SUSPENDED)) return COROUTINE_SUSPENDED
+ YIELD -> return COROUTINE_SUSPENDED
}
// otherwise, afterCompletion was already invoked, and the result is in the state
val state = getState()
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CommonPool.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CommonPool.kt
index b1b7b4a..d5610aa 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CommonPool.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CommonPool.kt
@@ -3,7 +3,7 @@
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicInteger
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Represents common pool of shared threads as coroutine dispatcher for compute-intensive tasks.
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineContext.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineContext.kt
index 2d8a0a0..eed8ab6 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineContext.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineContext.kt
@@ -1,8 +1,8 @@
package kotlinx.coroutines.experimental
import java.util.concurrent.atomic.AtomicLong
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.AbstractCoroutineContextElement
+import kotlin.coroutines.experimental.CoroutineContext
private const val DEBUG_PROPERTY_NAME = "kotlinx.coroutines.debug"
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineDispatcher.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineDispatcher.kt
index bb420b0..ff9e799 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineDispatcher.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineDispatcher.kt
@@ -1,9 +1,9 @@
package kotlinx.coroutines.experimental
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.ContinuationInterceptor
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.AbstractCoroutineContextElement
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.ContinuationInterceptor
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Base class that shall be extended by all coroutine dispatcher implementations.
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineExceptionHandler.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineExceptionHandler.kt
index 3400772..62a02db 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineExceptionHandler.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineExceptionHandler.kt
@@ -1,6 +1,6 @@
package kotlinx.coroutines.experimental
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineName.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineName.kt
index 07ef03d..b85f18d 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineName.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineName.kt
@@ -1,7 +1,7 @@
package kotlinx.coroutines.experimental
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.AbstractCoroutineContextElement
+import kotlin.coroutines.experimental.CoroutineContext
/**
* User-specified name of coroutine. This name is used in debugging mode.
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineScope.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineScope.kt
index 0b3c5ba..1c6616b 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineScope.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineScope.kt
@@ -1,7 +1,7 @@
package kotlinx.coroutines.experimental
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Receiver interface for generic coroutine builders, so that the code inside coroutine has a convenient access
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Deferred.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Deferred.kt
index 1348d3e..6b5b448 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Deferred.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Deferred.kt
@@ -1,7 +1,7 @@
package kotlinx.coroutines.experimental
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.experimental.startCoroutine
/**
* Deferred value is conceptually a non-blocking cancellable future.
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Delay.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Delay.kt
index 653c9bd..c3ff552 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Delay.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Delay.kt
@@ -1,7 +1,7 @@
package kotlinx.coroutines.experimental
import java.util.concurrent.TimeUnit
-import kotlin.coroutines.ContinuationInterceptor
+import kotlin.coroutines.experimental.ContinuationInterceptor
/**
* This dispatcher _feature_ is implemented by [CoroutineDispatcher] implementations that natively support
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/EventLoop.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/EventLoop.kt
index 5e8c583..8b8b72d 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/EventLoop.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/EventLoop.kt
@@ -3,7 +3,7 @@
import kotlinx.coroutines.experimental.internal.LockFreeLinkedListHead
import kotlinx.coroutines.experimental.internal.LockFreeLinkedListNode
import java.util.concurrent.locks.LockSupport
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Implemented by [CoroutineDispatcher] implementations that have event loop inside and can
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Executors.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Executors.kt
index e6575bd..785158a 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Executors.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Executors.kt
@@ -4,7 +4,7 @@
import java.util.concurrent.ExecutorService
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.TimeUnit
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Converts an instance of [Executor] to an implementation of [CoroutineDispatcher].
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt
index fc8dab0..fbee2a7 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt
@@ -4,9 +4,9 @@
import kotlinx.coroutines.experimental.internal.LockFreeLinkedListNode
import java.util.concurrent.Future
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.AbstractCoroutineContextElement
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.CoroutineContext
// --------------- core job interfaces ---------------
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/LazyDeferred.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/LazyDeferred.kt
index 5b2f3db..8de7b2a 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/LazyDeferred.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/LazyDeferred.kt
@@ -1,8 +1,8 @@
package kotlinx.coroutines.experimental
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.experimental.startCoroutine
/**
* Lazy deferred value is conceptually a non-blocking cancellable future that is started on
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/NonCancellable.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/NonCancellable.kt
index 2dc9993..5d253e6 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/NonCancellable.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/NonCancellable.kt
@@ -1,7 +1,7 @@
package kotlinx.coroutines.experimental
import kotlinx.coroutines.experimental.NonCancellable.isActive
-import kotlin.coroutines.AbstractCoroutineContextElement
+import kotlin.coroutines.experimental.AbstractCoroutineContextElement
/**
* A non-cancelable job that is always [active][isActive]. It is designed to be used with [run] builder
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Scheduled.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Scheduled.kt
index 0569a61..0f7be96 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Scheduled.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Scheduled.kt
@@ -3,7 +3,7 @@
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.ScheduledThreadPoolExecutor
import java.util.concurrent.TimeUnit
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.startCoroutine
val KEEP_ALIVE = java.lang.Long.getLong("kotlinx.coroutines.ScheduledExecutor.keepAlive", 1000L)
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/ThreadPoolDispatcher.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/ThreadPoolDispatcher.kt
index 0ae441d..e6b3c92 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/ThreadPoolDispatcher.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/ThreadPoolDispatcher.kt
@@ -4,7 +4,7 @@
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Creates new coroutine execution context with the a single thread and built-in [yield] and [delay] support.
diff --git a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Intrinsics.kt b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Intrinsics.kt
index 75405ae..219a1d7 100644
--- a/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Intrinsics.kt
+++ b/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Intrinsics.kt
@@ -1,13 +1,13 @@
package kotlinx.coroutines.experimental.intrinsics
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
/**
* Starts coroutine without receiver and with result type [T].
* This function creates and start a new, fresh instance of suspendable computation every time it is invoked.
* If the coroutine never suspends, then its result is returned directly,
- * otherwise it returns [SUSPENDED_MARKER] and the [completion] continuation is invoked when coroutine completes.
+ * otherwise it returns [COROUTINE_SUSPENDED] and the [completion] continuation is invoked when coroutine completes.
*/
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
public fun <T> (suspend () -> T).startCoroutineOrReturn(completion: Continuation<T>): Any? =
diff --git a/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/internal/LockFreeLinkedListStressTest.kt b/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/internal/LockFreeLinkedListStressTest.kt
index 9aeabd3..635a896 100644
--- a/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/internal/LockFreeLinkedListStressTest.kt
+++ b/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/internal/LockFreeLinkedListStressTest.kt
@@ -4,6 +4,7 @@
import java.util.*
import java.util.concurrent.atomic.AtomicInteger
import kotlin.concurrent.thread
+import kotlin.coroutines.experimental.buildIterator
class LockFreeLinkedListStressTest {
private data class IntNode(val i: Int) : LockFreeLinkedListNode()
diff --git a/kotlinx-coroutines-javafx/pom.xml b/kotlinx-coroutines-javafx/pom.xml
index 5210b44..22e2049 100644
--- a/kotlinx-coroutines-javafx/pom.xml
+++ b/kotlinx-coroutines-javafx/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-javafx</artifactId>
diff --git a/kotlinx-coroutines-javafx/src/main/kotlin/kotlinx/coroutines/experimental/javafx/JavaFx.kt b/kotlinx-coroutines-javafx/src/main/kotlin/kotlinx/coroutines/experimental/javafx/JavaFx.kt
index aef898a..20e58d5 100644
--- a/kotlinx-coroutines-javafx/src/main/kotlin/kotlinx/coroutines/experimental/javafx/JavaFx.kt
+++ b/kotlinx-coroutines-javafx/src/main/kotlin/kotlinx/coroutines/experimental/javafx/JavaFx.kt
@@ -11,7 +11,7 @@
import kotlinx.coroutines.experimental.javafx.JavaFx.delay
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.TimeUnit
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
diff --git a/kotlinx-coroutines-jdk8/pom.xml b/kotlinx-coroutines-jdk8/pom.xml
index 80f7daa..ba59275 100644
--- a/kotlinx-coroutines-jdk8/pom.xml
+++ b/kotlinx-coroutines-jdk8/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-jdk8</artifactId>
diff --git a/kotlinx-coroutines-jdk8/src/main/kotlin/kotlinx/coroutines/experimental/future/Future.kt b/kotlinx-coroutines-jdk8/src/main/kotlin/kotlinx/coroutines/experimental/future/Future.kt
index f02b0eb..adeb727 100644
--- a/kotlinx-coroutines-jdk8/src/main/kotlin/kotlinx/coroutines/experimental/future/Future.kt
+++ b/kotlinx-coroutines-jdk8/src/main/kotlin/kotlinx/coroutines/experimental/future/Future.kt
@@ -2,9 +2,9 @@
import kotlinx.coroutines.experimental.*
import java.util.concurrent.CompletableFuture
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.experimental.startCoroutine
/**
* Starts new coroutine and returns its results an an implementation of [CompletableFuture].
diff --git a/kotlinx-coroutines-jdk8/src/test/kotlin/kotlinx/coroutines/experimental/future/FutureTest.kt b/kotlinx-coroutines-jdk8/src/test/kotlin/kotlinx/coroutines/experimental/future/FutureTest.kt
index a5d6b45..cd1296e 100644
--- a/kotlinx-coroutines-jdk8/src/test/kotlin/kotlinx/coroutines/experimental/future/FutureTest.kt
+++ b/kotlinx-coroutines-jdk8/src/test/kotlin/kotlinx/coroutines/experimental/future/FutureTest.kt
@@ -5,7 +5,7 @@
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ExecutionException
import java.util.concurrent.atomic.AtomicInteger
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
diff --git a/kotlinx-coroutines-nio/pom.xml b/kotlinx-coroutines-nio/pom.xml
index 64c270e..7bee711 100644
--- a/kotlinx-coroutines-nio/pom.xml
+++ b/kotlinx-coroutines-nio/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-nio</artifactId>
diff --git a/kotlinx-coroutines-rx-example/pom.xml b/kotlinx-coroutines-rx-example/pom.xml
index fd59a0a..ab69393 100644
--- a/kotlinx-coroutines-rx-example/pom.xml
+++ b/kotlinx-coroutines-rx-example/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-rx-example</artifactId>
diff --git a/kotlinx-coroutines-rx/pom.xml b/kotlinx-coroutines-rx/pom.xml
index b37de9e..83a7a0a 100644
--- a/kotlinx-coroutines-rx/pom.xml
+++ b/kotlinx-coroutines-rx/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-rx</artifactId>
diff --git a/kotlinx-coroutines-rx/src/main/kotlin/kotlinx/coroutines/experimental/rx/asyncRx.kt b/kotlinx-coroutines-rx/src/main/kotlin/kotlinx/coroutines/experimental/rx/asyncRx.kt
index 8867d95..4f8e236 100644
--- a/kotlinx-coroutines-rx/src/main/kotlin/kotlinx/coroutines/experimental/rx/asyncRx.kt
+++ b/kotlinx-coroutines-rx/src/main/kotlin/kotlinx/coroutines/experimental/rx/asyncRx.kt
@@ -2,7 +2,7 @@
import rx.Observable
import rx.subjects.AsyncSubject
-import kotlin.coroutines.*
+import kotlin.coroutines.experimental.*
/**
* Run asynchronous computations based on [block] coroutine parameter
diff --git a/kotlinx-coroutines-swing/pom.xml b/kotlinx-coroutines-swing/pom.xml
index 1915004..3720ec3 100644
--- a/kotlinx-coroutines-swing/pom.xml
+++ b/kotlinx-coroutines-swing/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
</parent>
<artifactId>kotlinx-coroutines-swing</artifactId>
diff --git a/kotlinx-coroutines-swing/src/main/kotlin/kotlinx/coroutines/experimental/swing/Swing.kt b/kotlinx-coroutines-swing/src/main/kotlin/kotlinx/coroutines/experimental/swing/Swing.kt
index b847584..bcdcfd9 100644
--- a/kotlinx-coroutines-swing/src/main/kotlin/kotlinx/coroutines/experimental/swing/Swing.kt
+++ b/kotlinx-coroutines-swing/src/main/kotlin/kotlinx/coroutines/experimental/swing/Swing.kt
@@ -8,7 +8,7 @@
import java.util.concurrent.TimeUnit
import javax.swing.SwingUtilities
import javax.swing.Timer
-import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.experimental.CoroutineContext
/**
* Dispatches execution onto Swing event dispatching thread and provides native [delay] support.
diff --git a/kotlinx-coroutines-swing/src/test/kotlin/examples/swing-example.kt b/kotlinx-coroutines-swing/src/test/kotlin/examples/swing-example.kt
index 1f1dc2f..01bfc57 100644
--- a/kotlinx-coroutines-swing/src/test/kotlin/examples/swing-example.kt
+++ b/kotlinx-coroutines-swing/src/test/kotlin/examples/swing-example.kt
@@ -5,7 +5,7 @@
import java.text.SimpleDateFormat
import java.util.*
import java.util.concurrent.ForkJoinPool
-import kotlin.coroutines.suspendCoroutine
+import kotlin.coroutines.experimental.suspendCoroutine
fun log(msg: String) = println("${SimpleDateFormat("YYYYMMdd-HHmmss.sss").format(Date())} [${Thread.currentThread().name}] $msg")
diff --git a/pom.xml b/pom.xml
index 9812777..48bb650 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines</artifactId>
- <version>0.5-beta-SNAPSHOT</version>
+ <version>0.6-rc-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Kotlin coroutines libraries</name>
@@ -33,7 +33,7 @@
<repository>
<id>bintray</id>
<name>bintray</name>
- <url>http://dl.bintray.com/kotlin/kotlin-eap-1.1</url>
+ <url>http://dl.bintray.com/kotlin/kotlin-dev</url>
</repository>
</repositories>
@@ -41,7 +41,7 @@
<pluginRepository>
<id>bintray</id>
<name>bintray</name>
- <url>http://dl.bintray.com/kotlin/kotlin-eap-1.1</url>
+ <url>http://dl.bintray.com/kotlin/kotlin-dev</url>
</pluginRepository>
<pluginRepository>
<id>bintray-kotlin-dokka</id>
@@ -61,7 +61,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <kotlin.version>1.1.0-beta-22</kotlin.version>
+ <kotlin.version>1.1.0-dev-6605</kotlin.version>
<dokka.version>0.9.13</dokka.version>
<junit.version>4.12</junit.version>
<maven.compiler.source>1.6</maven.compiler.source>