Merge branch 'release/v3.0.0-beta.4'

README.md

@@ -17,7 +17,7 @@ task { "world" } and task { "Hello" } success {
 Please refer to the [Kovenant](http://kovenant.komponents.nl) site for API usage and more.
 
 ## Getting started
-Build against Kotlin 1.0 beta 4: `1.0.0-beta-4586`.
+Build against Kotlin 1.0 beta 4: `1.0.0-beta-4583`.
 Source and target compatibility is `1.6`
 
 ###Snapshot repository

build.gradle

@@ -20,7 +20,7 @@
  */
 
 buildscript {
-    ext.kotlinVersion = '1.0.0-beta-3595'
+    ext.kotlinVersion = '1.0.0-beta-4583'
     ext.extraConfVersion = '2.2.+'
 
     repositories {
@@ -79,6 +79,7 @@ subprojects {
         compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}", optional
 
         testCompile "junit:junit:${junitVersion}"
+        testCompile "org.jetbrains.kotlin:kotlin-test:${kotlinVersion}"
     }
 
 

docs/docs/index.md

@@ -25,7 +25,7 @@ Developed with the following [goals](misc/goals.md) in mind.
 * **Dependency free**: when not counting kotlin std 
 
 ## Getting started
-Build against Kotlin 1.0 beta 4: `1.0.0-beta-4586`.
+Build against Kotlin 1.0 beta 4: `1.0.0-beta-4583`.
 Source and target compatibility is `1.6`
 
 ###Snapshot repository

projects/core/src/main/kotlin/delegates-jvm.kt

@@ -21,7 +21,10 @@
 
 package nl.komponents.kovenant.properties
 
-import nl.komponents.kovenant.*
+import nl.komponents.kovenant.Context
+import nl.komponents.kovenant.Kovenant
+import nl.komponents.kovenant.Promise
+import nl.komponents.kovenant.task
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.reflect.KProperty
 
@@ -69,7 +72,7 @@ public class LazyPromise<T>(
             }
             //Signal other threads are more important at the moment
             //Since another thread is initializing this property
-            Thread.yield()
+            Thread.`yield`()
         }
         return promise!!
     }

projects/core/src/main/kotlin/dispatcher-jvm.kt

@@ -470,8 +470,8 @@ private class YieldingPollStrategy<V : Any>(private val pollable: Pollable<V>,
         for (i in 0..attempts) {
             val value = pollable.poll(block = false)
             if (value != null) return value
-            Thread.yield()
-            if (Thread.currentThread().isInterrupted()) break
+            Thread.`yield`()
+            if (Thread.currentThread().isInterrupted) break
         }
         return null
     }
@@ -491,7 +491,7 @@ private class BusyPollStrategy<V : Any>(private val pollable: Pollable<V>,
         for (i in 0..attempts) {
             val value = pollable.poll(block = false)
             if (value != null) return value
-            if (Thread.currentThread().isInterrupted()) break
+            if (Thread.currentThread().isInterrupted) break
         }
         return null
     }

projects/core/src/main/kotlin/promises-jvm.kt

@@ -199,7 +199,7 @@ private class DeferredPromise<V, E>(context: Context) : AbstractPromise<V, E>(co
     //Only call this method if we know resolving is eminent.
     private fun multipleCompletion(newValue: Any?) {
         while (!isDoneInternal()) {
-            Thread.yield()
+            Thread.`yield`()
         }
         context.multipleCompletion(rawValue(), newValue)
     }

projects/core/src/main/kotlin/properties-jvm.kt

@@ -51,7 +51,7 @@ public class ThreadSafeLazyVar<T>(initializer: () -> T) : ReadWriteProperty<Any?
 
             //Signal other threads are more important at the moment
             //Since another thread is initializing this property
-            Thread.yield()
+            Thread.`yield`()
         }
         return unmask<T>(value)
     }

projects/core/src/test/kotlin/tests/api/get.kt

@@ -134,10 +134,10 @@ class GetAsyncTest {
         thread.start()
 
         startLatch.await()
-        loop@while (true) when (thread.getState()) {
+        loop@while (true) when (thread.state) {
             Thread.State.BLOCKED, Thread.State.WAITING, Thread.State.TIMED_WAITING -> break@loop
             Thread.State.TERMINATED -> break@loop
-            else -> Thread.yield()
+            else -> Thread.`yield`()
         }
         trigger()
         stopLatch.await()