plus for flows

0.3.2

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.3
+
+* `Coroutines`:
+    * New extension `Flow<T>#plus`
+
 ## 0.3.2
 
 * `Versions`:

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/FlowsSum.kt

@@ -0,0 +1,8 @@
+@file:Suppress("NOTHING_TO_INLINE")
+
+package dev.inmo.micro_utils.coroutines
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.merge
+
+inline operator fun <T> Flow<T>.plus(other: Flow<T>) = merge(this, other)

defaultAndroidSettings

@@ -12,6 +12,9 @@ android {
         release {
             minifyEnabled false
         }
+        debug {
+            debuggable true
+        }
     }
 
     packagingOptions {
@@ -28,4 +31,8 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
 }

gradle.properties

@@ -26,7 +26,7 @@ uuidVersion=0.2.2
 core_ktx_version=1.3.2
 androidx_recycler_version=1.1.0
 
-android_minSdkVersion=24
+android_minSdkVersion=19
 android_compileSdkVersion=30
 android_buildToolsVersion=30.0.2
 dexcount_version=2.0.0-RC1
@@ -41,5 +41,5 @@ dokka_version=1.4.0
 # Project data
 
 group=dev.inmo
-version=0.3.2
+version=0.3.3
-android_code_version=2
+android_code_version=3

mppAndroidProject

@@ -4,7 +4,9 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    android {}
+    android {
+        publishAllLibraryVariants()
+    }
 
     sourceSets {
         commonMain {

mppProjectWithSerialization

@@ -10,7 +10,7 @@ kotlin {
         nodejs()
     }
     android {
-        publishLibraryVariants("release")
+        publishAllLibraryVariants()
     }
 
     sourceSets {

publish.gradle

@@ -13,10 +13,16 @@ bintray {
                 if (directorySubname == "kotlinMultiplatform") {
                     it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
                 } else {
-                    if (directorySubname.indexOf("android") != -1) {
+                    switch (directorySubname) {
-                        it.setPath("${project.name}-android/${project.version}/${project.name}-android-${project.version}.module")
+                        case "androidRelease":
-                    } else {
+                            it.setPath("${project.name}-android/${project.version}/${project.name}-android-${project.version}.module")
-                        it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                            break
+                        case "androidDebug":
+                            it.setPath("${project.name}-android-debug/${project.version}/${project.name}-android-debug-${project.version}.module")
+                            break
+                        default:
+                            it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
+                            break
                     }
                 }
             } else {