Upgrade to Kotlin 1.6.0

Author: akarnokd

README.md

@@ -11,7 +11,7 @@ Extensions to the Kotlin Flow library.
 
 ```groovy
 dependencies {
-    implementation "com.github.akarnokd:kotlin-flow-extensions:0.0.12"
+    implementation "com.github.akarnokd:kotlin-flow-extensions:0.0.13"
 }
 ```
 

build.gradle

@@ -1,11 +1,12 @@
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.0'
     ext.dokka_version = '1.5.31'
     ext.bnd_version = '5.3.0'
     ext.license_version = '0.15.0'
     ext.vanniktech_version = '0.18.0'
+    ext.coroutines_version = '1.5.2'
 
     repositories {
         mavenCentral()
@@ -35,7 +36,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.github.akarnokd
-VERSION_NAME=0.0.12
+VERSION_NAME=0.0.13
 
 POM_ARTIFACT_ID=kotlin-flow-extensions
 POM_NAME=Kotlin Flow Extensions

src/main/kotlin/hu/akarnokd/kotlin/flow/PublishSubject.kt

@@ -60,7 +60,7 @@ class PublishSubject<T> : AbstractFlow<T>(), SubjectAPI<T>  {
             try {
                 collector.next(value)
             } catch (ex: CancellationException) {
-                remove(collector);
+                remove(collector)
             }
         }
     }
@@ -142,7 +142,6 @@ class PublishSubject<T> : AbstractFlow<T>(), SubjectAPI<T>  {
     /**
      * Start collecting signals from this PublishSubject.
      */
-    @FlowPreview
     override suspend fun collectSafely(collector: FlowCollector<T>) {
         val inner = ResumableCollector<T>()
         if (add(inner)) {

src/main/kotlin/hu/akarnokd/kotlin/flow/ReplaySubject.kt

@@ -89,7 +89,6 @@ class ReplaySubject<T> : AbstractFlow<T>, SubjectAPI<T> {
      * and any subsequent value received by this ReplaySubject until
      * the ReplaySubject gets terminated.
      */
-    @FlowPreview
     override suspend fun collectSafely(collector: FlowCollector<T>) {
         val inner = InnerCollector(collector, this)
         add(inner)

src/main/kotlin/hu/akarnokd/kotlin/flow/impl/FlowConcatArrayEager.kt

@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicIntegerArray
 @FlowPreview
 class FlowConcatArrayEager<T>(private val sources: Array<out Flow<T>>) : AbstractFlow<T>() {
 
-    @InternalCoroutinesApi
     override suspend fun collectSafely(collector: FlowCollector<T>) {
         val n = sources.size
         val queues = Array(n) { ConcurrentLinkedQueue<T>() }

src/main/kotlin/hu/akarnokd/kotlin/flow/impl/FlowFlatMapDrop.kt

@@ -26,8 +26,6 @@ import java.util.concurrent.atomic.AtomicReference
 
 @FlowPreview
 internal class FlowFlatMapDrop<T, R>(private val source: Flow<T>, private val mapper: suspend (T) -> Flow<R>) : AbstractFlow<R>() {
-    @ExperimentalCoroutinesApi
-    @InternalCoroutinesApi
     override suspend fun collectSafely(collector: FlowCollector<R>) {
         coroutineScope {
 

src/main/kotlin/hu/akarnokd/kotlin/flow/impl/FlowMergeArray.kt

@@ -36,7 +36,6 @@ import java.util.concurrent.atomic.AtomicInteger
 @FlowPreview
 class FlowMergeArray<T>(private val sources: Array<out Flow<T>>) : AbstractFlow<T>() {
 
-    @InternalCoroutinesApi
     override suspend fun collectSafely(collector: FlowCollector<T>) {
         val queue = ConcurrentLinkedQueue<T>()
         val done = AtomicInteger(sources.size)

src/main/kotlin/hu/akarnokd/kotlin/flow/impl/FlowMulticastFunction.kt

@@ -34,8 +34,6 @@ internal class FlowMulticastFunction<T, R>(
         private val transform: suspend (Flow<T>) -> Flow<R>
 ) : AbstractFlow<R>() {
 
-    @ExperimentalCoroutinesApi
-    @InternalCoroutinesApi
     override suspend fun collectSafely(collector: FlowCollector<R>) {
 
         coroutineScope {

src/main/kotlin/hu/akarnokd/kotlin/flow/impl/FlowOnBackpressureDrop.kt

@@ -27,8 +27,6 @@ import java.util.concurrent.atomic.AtomicReference
 
 @FlowPreview
 internal class FlowOnBackpressureDrop<T>(private val source: Flow<T>) : AbstractFlow<T>() {
-    @ExperimentalCoroutinesApi
-    @InternalCoroutinesApi
     override suspend fun collectSafely(collector: FlowCollector<T>) {
         coroutineScope {
             val consumerReady = AtomicBoolean()