From e113dc28edc818a689cd3549d7f576d2a4cc5f4f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 4 Apr 2022 10:05:56 +0600 Subject: [PATCH 1/8] start 0.9.19 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9991b235ec9..c9570b66ce6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.9.18 -android_code_version=108 +version=0.9.19 +android_code_version=109 From 888dc299c9348aba8b3ad27ad60dad37a261b53d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 4 Apr 2022 10:06:57 +0600 Subject: [PATCH 2/8] update kotlin --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 25021e34a23..ad332055778 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kt = "1.6.10" +kt = "1.6.20" kt-serialization = "1.3.2" kt-coroutines = "1.6.0" From b85ab7b06111e37200318b5b87bd75fe23c408e8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 6 Apr 2022 11:47:06 +0600 Subject: [PATCH 3/8] update coroutines --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad332055778..d87dca36425 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kt = "1.6.20" kt-serialization = "1.3.2" -kt-coroutines = "1.6.0" +kt-coroutines = "1.6.1" jb-compose = "1.1.1" jb-exposed = "0.37.3" From 223fed910f6a2e27940aef405e2687eef37debad Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 7 Apr 2022 00:43:55 +0600 Subject: [PATCH 4/8] fix for column name of table version in exposed standard versions repo proxy --- .../kotlin/dev/inmo/micro_utils/common/Either.kt | 9 --------- .../exposed/versions/ExposedStandardVersionsRepoProxy.kt | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt index 2bf9c57ade4..595967582d1 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt @@ -27,13 +27,6 @@ sealed interface Either { @Deprecated("Use optionalT2 instead", ReplaceWith("optionalT2")) val t2: T2? get() = optionalT2.dataOrNull() - - companion object { - fun serializer( - t1Serializer: KSerializer, - t2Serializer: KSerializer, - ): KSerializer> = EitherSerializer(t1Serializer, t2Serializer) - } } class EitherSerializer( @@ -51,7 +44,6 @@ class EitherSerializer( private val t1EitherSerializer = EitherFirst.serializer(t1Serializer, t2Serializer) private val t2EitherSerializer = EitherSecond.serializer(t1Serializer, t2Serializer) - @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override fun deserialize(decoder: Decoder): Either { return decoder.decodeStructure(descriptor) { var type: String? = null @@ -83,7 +75,6 @@ class EitherSerializer( } - @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override fun serialize(encoder: Encoder, value: Either) { encoder.encodeStructure(descriptor) { when (value) { diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt index 0c5a6c1e39d..6d4836a49e2 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt @@ -19,7 +19,7 @@ class ExposedStandardVersionsRepoProxy( override val database: Database ) : StandardVersionsRepoProxy, Table("ExposedVersionsProxy"), ExposedRepo { val tableNameColumn = text("tableName") - val tableVersionColumn = integer("tableName") + val tableVersionColumn = integer("tableVersion") init { initTable() From bc37b11cee0e3df9cbb7174c636c00646fbe5c53 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 7 Apr 2022 09:56:23 +0600 Subject: [PATCH 5/8] downgrade kotlin --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d87dca36425..c31524d819f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kt = "1.6.20" +kt = "1.6.10" kt-serialization = "1.3.2" kt-coroutines = "1.6.1" From 4790fe0aeaabf244aa03382dc6cf77cc03d82db3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 7 Apr 2022 09:59:58 +0600 Subject: [PATCH 6/8] get back either serializer fun --- .../kotlin/dev/inmo/micro_utils/common/Either.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt index 595967582d1..682f3c9c4f7 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt @@ -27,6 +27,13 @@ sealed interface Either { @Deprecated("Use optionalT2 instead", ReplaceWith("optionalT2")) val t2: T2? get() = optionalT2.dataOrNull() + + companion object { + fun serializer( + t1Serializer: KSerializer, + t2Serializer: KSerializer, + ): KSerializer> = EitherSerializer(t1Serializer, t2Serializer) + } } class EitherSerializer( From b61d2ae2eb9613c0004228a482035b61b94345cc Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 7 Apr 2022 15:41:08 +0600 Subject: [PATCH 7/8] fixes in versions repo --- .../dev/inmo/micro_utils/repos/versions/VersionsRepo.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/versions/VersionsRepo.kt b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/versions/VersionsRepo.kt index ee7cbab700f..f372476d2f1 100644 --- a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/versions/VersionsRepo.kt +++ b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/versions/VersionsRepo.kt @@ -13,12 +13,12 @@ interface VersionsRepo : Repo { * By default, instance of this interface will check that version of table with name [tableName] is less than * [version] or is absent * - * * In case if [tableName] didn't found, will be called [onCreate] and version of table will be set up to [version] - * * In case if [tableName] have version less than parameter [version], it will increase version one-by-one - * until database version will be equal to [version] + * In case if [tableName] didn't found, will be called [onCreate]. Then in case if [tableName] have version less + * than parameter [version] or null, it will increase version one-by-one until database version will be equal to + * [version] * * @param version Current version of table - * @param onCreate This callback will be called in case when table have no information about table + * @param onCreate This callback will be called in case when repo have no information about table * @param onUpdate This callback will be called after **iterative** changing of version. It is expected that parameter * "to" will always be greater than "from" */ From 8166d4b99bd65601188b83c626928420f53ba7a6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 8 Apr 2022 01:16:01 +0600 Subject: [PATCH 8/8] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 025a0fe4719..591beb46753 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.9.19 + +* `Versions`: + * `Coroutines`: `1.6.0` -> `1.6.1` +* `Repos`: + * `Exposed`: + * Fixes in `ExposedStandardVersionsRepoProxy` + ## 0.9.18 * `Common`