Fixes for Kotlin 1.2.0

Author: elizarov

core/kotlinx-coroutines-io/src/test/kotlin/kotlinx/coroutines/experimental/io/ByteBufferChannelTest.kt

@@ -2,19 +2,30 @@ package kotlinx.coroutines.experimental.io
 
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.channels.ClosedReceiveChannelException
-import kotlinx.coroutines.experimental.io.internal.*
-import kotlinx.coroutines.experimental.io.packet.*
+import kotlinx.coroutines.experimental.io.internal.BUFFER_SIZE
+import kotlinx.coroutines.experimental.io.internal.RESERVED_SIZE
+import kotlinx.coroutines.experimental.io.internal.ReadWriteBufferState
 import kotlinx.coroutines.experimental.io.packet.ByteReadPacket
-import kotlinx.io.core.*
-import kotlinx.io.pool.*
-import org.junit.*
+import kotlinx.coroutines.experimental.io.packet.ByteWritePacket
+import kotlinx.io.core.BufferView
+import kotlinx.io.core.BytePacketBuilder
+import kotlinx.io.core.readUTF8Line
+import kotlinx.io.pool.DefaultPool
+import kotlinx.io.pool.NoPoolImpl
+import org.junit.After
+import org.junit.Rule
+import org.junit.Test
 import org.junit.rules.ErrorCollector
 import org.junit.rules.Timeout
 import java.nio.CharBuffer
 import java.util.*
-import java.util.concurrent.*
-import java.util.concurrent.atomic.*
-import kotlin.test.*
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
+import kotlin.test.fail
 
 class ByteBufferChannelTest {
     @get:Rule

core/kotlinx-coroutines-io/src/test/kotlin/kotlinx/coroutines/experimental/io/CopyAndCloseNoAutoFlushTest.kt

@@ -1,10 +1,15 @@
 package kotlinx.coroutines.experimental.io
 
-import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.io.internal.*
-import org.junit.*
-import org.junit.rules.*
-import kotlin.test.*
+import kotlinx.coroutines.experimental.TestBase
+import kotlinx.coroutines.experimental.io.internal.BufferObjectPool
+import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.experimental.yield
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class CopyAndCloseNoAutoFlushTest : TestBase() {
     private val verifyingPool = VerifyingObjectPool(BufferObjectPool)

core/kotlinx-coroutines-io/src/test/kotlin/kotlinx/coroutines/experimental/io/CopyAndCloseTest.kt

@@ -1,10 +1,12 @@
 package kotlinx.coroutines.experimental.io
 
 import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.io.internal.*
-import org.junit.*
-import java.io.*
-import kotlin.test.*
+import kotlinx.coroutines.experimental.io.internal.asByteBuffer
+import org.junit.After
+import org.junit.Test
+import java.io.IOException
+import kotlin.test.assertEquals
+import kotlin.test.fail
 
 class CopyAndCloseTest : TestBase() {
     private val from = ByteChannel(true)

core/kotlinx-coroutines-io/src/test/kotlin/kotlinx/coroutines/experimental/io/ReadUntilDelimiterTest.kt

@@ -1,10 +1,15 @@
 package kotlinx.coroutines.experimental.io
 
 import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.io.internal.*
-import org.junit.*
-import java.io.*
-import kotlin.test.*
+import kotlinx.coroutines.experimental.io.internal.BUFFER_SIZE
+import kotlinx.coroutines.experimental.io.internal.asByteBuffer
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.io.IOException
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.test.fail
 
 class ReadUntilDelimiterTest : TestBase() {
     private val source = ByteChannel(true)

gradle.properties

@@ -2,7 +2,7 @@ version = 0.19.3-SNAPSHOT
 
 kotlin_version = 1.2.0
 junit_version = 4.12
-atomicFU_version = 0.9.1
+atomicFU_version = 0.9.2
 lincheck_version=1.9
 dokka_version = 0.9.15