update serialization

0.4.25

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.4.26
+
+* `Versions`:
+    * `Serialization`: `1.0.1` -> `1.1.0`
+
+## 0.4.25
+
+* `Matrix`:
+    * Subproject has been created
+
+## 0.4.24
+
+* `Versions`:
+    * `Kotlin`: `1.4.21` -> `1.4.30`
+    * `Klock`: `2.0.4` -> `2.0.6`
+* `Coroutines`:
+    * New class `DoWithFirstBuilder`
+    * Several new extensions like `firstOf`/`first`/`invokeOnFirstOf`
+
 ## 0.4.23
 
 * `Versions`:

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

@@ -9,6 +9,19 @@ class DeferredAction<T, O>(
     suspend operator fun invoke() = callback(deferred.await())
 }
 
+class DoWithFirstBuilder<T>(
+    private val scope: CoroutineScope
+) {
+    private val deferreds = mutableListOf<Deferred<T>>()
+    operator fun plus(block: suspend CoroutineScope.() -> T) {
+        deferreds.add(scope.async(start = CoroutineStart.LAZY, block = block))
+    }
+    inline fun add(noinline block: suspend CoroutineScope.() -> T) = plus(block)
+    inline fun include(noinline block: suspend CoroutineScope.() -> T) = plus(block)
+
+    fun build() = deferreds.toList()
+}
+
 fun <T, O> Deferred<T>.buildAction(callback: suspend (T) -> O) = DeferredAction(this, callback)
 
 suspend fun <O> Iterable<DeferredAction<*, O>>.invokeFirstOf(
@@ -32,9 +45,41 @@ suspend fun <T, O> Iterable<Deferred<T>>.invokeOnFirst(
     callback: suspend (T) -> O
 ): O = map { it.buildAction(callback) }.invokeFirstOf(scope, cancelOnResult)
 
+suspend fun <T, O> CoroutineScope.invokeOnFirstOf(
+    cancelOnResult: Boolean = true,
+    block: DoWithFirstBuilder<T>.() -> Unit,
+    callback: suspend (T) -> O
+) = firstOf(
+    DoWithFirstBuilder<T>(this).apply(block).build(),
+    cancelOnResult
+).let { callback(it) }
+
 suspend fun <T, O> invokeOnFirst(
     scope: CoroutineScope,
     vararg variants: Deferred<T>,
     cancelOnResult: Boolean = true,
     callback: suspend (T) -> O
 ): O = variants.toList().invokeOnFirst(scope, cancelOnResult, callback)
+
+suspend fun <T> CoroutineScope.firstOf(
+    variants: Iterable<Deferred<T>>,
+    cancelOnResult: Boolean = true
+) = variants.invokeOnFirst(this, cancelOnResult) { it }
+
+suspend fun <T> CoroutineScope.firstOf(
+    cancelOnResult: Boolean = true,
+    block: DoWithFirstBuilder<T>.() -> Unit
+) = firstOf(
+    DoWithFirstBuilder<T>(this).apply(block).build(),
+    cancelOnResult
+)
+
+suspend fun <T> CoroutineScope.firstOf(
+    vararg variants: Deferred<T>,
+    cancelOnResult: Boolean = true
+) = firstOf(variants.toList(), cancelOnResult)
+
+suspend fun <T> List<Deferred<T>>.first(
+    scope: CoroutineScope,
+    cancelOnResult: Boolean = true
+) = scope.firstOf(this, cancelOnResult)

gradle.properties

@@ -6,14 +6,14 @@ kotlin.incremental.js=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-kotlin_version=1.4.21
+kotlin_version=1.4.30
 kotlin_coroutines_version=1.4.2
-kotlin_serialisation_core_version=1.0.1
+kotlin_serialisation_core_version=1.1.0
 kotlin_exposed_version=0.29.1
 
 ktor_version=1.5.1
 
-klockVersion=2.0.4
+klockVersion=2.0.6
 
 github_release_plugin_version=2.2.12
 
@@ -44,5 +44,5 @@ dokka_version=1.4.20
 # Project data
 
 group=dev.inmo
-version=0.4.23
-android_code_version=27
+version=0.4.26
+android_code_version=30

matrix/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+    id "com.android.library"
+}
+
+apply from: "$mppProjectWithSerializationPresetPath"

matrix/src/commonMain/kotlin/dev/inmo/micro_utils/matrix/Matrix.kt

@@ -0,0 +1,3 @@
+package dev.inmo.micro_utils.matrix
+
+typealias Matrix<T> = List<Row<T>>

matrix/src/commonMain/kotlin/dev/inmo/micro_utils/matrix/MatrixBuilder.kt

@@ -0,0 +1,13 @@
+package dev.inmo.micro_utils.matrix
+
+class MatrixBuilder<T> {
+    private val mutMatrix: MutableList<List<T>> = ArrayList()
+    val matrix: Matrix<T>
+        get() = mutMatrix
+
+    fun row(t: List<T>) = mutMatrix.add(t)
+    operator fun List<T>.unaryPlus() = row(this)
+}
+
+fun <T> MatrixBuilder<T>.row(block: RowBuilder<T>.() -> Unit) = +RowBuilder<T>().also(block).row
+fun <T> MatrixBuilder<T>.row(vararg elements: T) = +elements.toList()

matrix/src/commonMain/kotlin/dev/inmo/micro_utils/matrix/MatrixFactories.kt

@@ -0,0 +1,17 @@
+package dev.inmo.micro_utils.matrix
+
+fun <T> matrix(block: MatrixBuilder<T>.() -> Unit): Matrix<T> {
+    return MatrixBuilder<T>().also(block).matrix
+}
+
+fun <T> flatMatrix(block: RowBuilder<T>.() -> Unit): Matrix<T> {
+    return MatrixBuilder<T>().apply {
+        row(block)
+    }.matrix
+}
+
+fun <T> flatMatrix(vararg elements: T): Matrix<T> {
+    return MatrixBuilder<T>().apply {
+        row { elements.forEach { +it } }
+    }.matrix
+}

matrix/src/commonMain/kotlin/dev/inmo/micro_utils/matrix/Row.kt

@@ -0,0 +1,3 @@
+package dev.inmo.micro_utils.matrix
+
+typealias Row<T> = List<T>

matrix/src/commonMain/kotlin/dev/inmo/micro_utils/matrix/RowBuilder.kt

@@ -0,0 +1,14 @@
+package dev.inmo.micro_utils.matrix
+
+class RowBuilder<T> {
+    private val mutRow: MutableList<T> = ArrayList()
+    val row: Row<T>
+        get() = mutRow
+
+    fun column(t: T) = mutRow.add(t)
+    operator fun T.unaryPlus() = column(this)
+}
+
+fun <T> row(block: RowBuilder<T>.() -> Unit): List<T> = RowBuilder<T>().also(block).row
+fun <T> RowBuilder<T>.columns(elements: List<T>) = elements.forEach(::column)
+fun <T> RowBuilder<T>.columns(vararg elements: T) = elements.forEach(::column)

matrix/src/commonTest/kotlin/dev/inmo/micro_utils/matrix/SimpleTest.kt

@@ -0,0 +1,45 @@
+package dev.inmo.micro_utils.matrix
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class SimpleTest {
+    @Test
+    fun simpleTest() {
+        val expected = listOf(
+            listOf(1, 2, 3),
+            listOf(4, 5, 6)
+        )
+
+        val fromMatrixWithVarargs = matrix<Int> {
+            row(1, 2, 3)
+            row(4, 5, 6)
+        }
+
+        val fromMatrixWithColumnsVarargs = matrix<Int> {
+            row {
+                columns(1, 2, 3)
+            }
+            row {
+                columns(4, 5, 6)
+            }
+        }
+
+        val fromMatrixWithSimpleAdd = matrix<Int> {
+            row {
+                column(1)
+                column(2)
+                column(3)
+            }
+            row {
+                column(4)
+                column(5)
+                column(6)
+            }
+        }
+
+        assertEquals(expected, fromMatrixWithVarargs)
+        assertEquals(expected, fromMatrixWithColumnsVarargs)
+        assertEquals(expected, fromMatrixWithSimpleAdd)
+    }
+}

matrix/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="dev.inmo.micro_utils.matrix"/>

mppJavaProject

@@ -4,7 +4,9 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
 
     sourceSets {
         commonMain {

mppProjectWithSerialization

@@ -4,7 +4,9 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
     js (BOTH) {
         browser()
         nodejs()

pubconf.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"MicroUtils","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/MicroUtils","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/InsanusMokrassar/MicroUtils_mirror/src/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"","url":"https://git.inmo.dev/InsanusMokrassar/MicroUtils_mirror","vcsUrl":"ssh://git@git.inmo.dev:8322/InsanusMokrassar/MicroUtils_mirror.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}]}}
+{"bintrayConfig":{"repo":"MicroUtils","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/MicroUtils","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/InsanusMokrassar/MicroUtils_mirror/src/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://git.inmo.dev/InsanusMokrassar/MicroUtils_mirror","vcsUrl":"ssh://git@git.inmo.dev:8322/InsanusMokrassar/MicroUtils_mirror.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}]}}

publish.gradle

@@ -1,31 +1,16 @@
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
 
 publishing {
     publications.all {
         artifact javadocsJar
 
         pom {
-            description = ""
+            description = "It is set of projects with micro tools for avoiding of routines coding"
             name = "${project.name}"
             url = "https://git.inmo.dev/InsanusMokrassar/MicroUtils_mirror"
 
@@ -70,7 +55,22 @@ publishing {
                     password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
                 }
             }
+            
+            maven {
+                name = "sonatype"
+                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                }
+            }
+            
         }
         
     }
-}
+}
+
+signing {
+    useGpgCmd()
+    sign publishing.publications
+}

settings.gradle

@@ -2,6 +2,7 @@ rootProject.name='micro_utils'
 
 String[] includes = [
     ":common",
+    ":matrix",
     ":crypto",
     ":selector:common",
     ":pagination:common",