From d45aef9fe577ac4b56829e653fb7cefc4db0e9fe Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 28 Dec 2021 09:58:59 +0600 Subject: [PATCH 1/6] start 0.9.0 --- gradle.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 11b070657eb..fa7cffe8e2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,14 +7,14 @@ android.useAndroidX=true android.enableJetifier=true org.gradle.jvmargs=-Xmx2g -kotlin_version=1.5.31 -kotlin_coroutines_version=1.5.2 -kotlin_serialisation_core_version=1.3.1 -kotlin_exposed_version=0.36.2 +kotlin_version=1.6.10 +kotlin_coroutines_version=1.6.0 +kotlin_serialisation_core_version=1.3.2 +kotlin_exposed_version=0.37.1 -ktor_version=1.6.5 +ktor_version=1.6.7 -klockVersion=2.4.8 +klockVersion=2.4.10 github_release_plugin_version=2.2.12 @@ -45,5 +45,5 @@ dokka_version=1.5.31 # Project data group=dev.inmo -version=0.8.9 -android_code_version=89 +version=0.9.0 +android_code_version=90 From f4ee6c28906627d31487b21a4ba3af8f5dc07448 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 28 Dec 2021 21:16:34 +0600 Subject: [PATCH 2/6] update exposed and adapt to new version of kotlin serialization --- .gitignore | 1 + CHANGELOG.md | 10 ++++++++++ .../kotlin/dev/inmo/micro_utils/common/Either.kt | 9 +++------ gradle.properties | 2 +- .../typed_serializer/TypedSerializer.kt | 12 ++++-------- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 8a04b36aa50..b13f70aec8f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ out/ secret.gradle local.properties + publishing.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a1c7c583fe..0d19da3e553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 0.9.0 + +* `Versions`: + * `Kotlin`: `1.5.31` -> `1.6.10` + * `Coroutines`: `1.5.2` -> `1.6.0` + * `Serialization`: `1.3.1` -> `1.3.2` + * `Exposed`: `0.36.2` -> `0.37.2` + * `Ktor`: `1.6.5` -> `1.6.7` + * `Klock`: `2.4.8` -> `2.4.10` + ## 0.8.9 * `Ktor`: 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 135c41672cd..0ec4dd895fd 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 @@ -32,8 +32,7 @@ class EitherSerializer( t1Serializer: KSerializer, t2Serializer: KSerializer, ) : KSerializer> { - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override val descriptor: SerialDescriptor = buildSerialDescriptor( "TypedSerializer", SerialKind.CONTEXTUAL @@ -44,8 +43,7 @@ class EitherSerializer( private val t1EitherSerializer = EitherFirst.serializer(t1Serializer, t2Serializer) private val t2EitherSerializer = EitherSecond.serializer(t1Serializer, t2Serializer) - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override fun deserialize(decoder: Decoder): Either { return decoder.decodeStructure(descriptor) { var type: String? = null @@ -77,8 +75,7 @@ class EitherSerializer( } - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override fun serialize(encoder: Encoder, value: Either) { encoder.encodeStructure(descriptor) { when (value) { diff --git a/gradle.properties b/gradle.properties index fa7cffe8e2e..0baff625e3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.6.10 kotlin_coroutines_version=1.6.0 kotlin_serialisation_core_version=1.3.2 -kotlin_exposed_version=0.37.1 +kotlin_exposed_version=0.37.2 ktor_version=1.6.7 diff --git a/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt b/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt index 804a0bc637e..006d0728677 100644 --- a/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt +++ b/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt @@ -11,8 +11,7 @@ open class TypedSerializer( presetSerializers: Map> = emptyMap(), ) : KSerializer { protected val serializers = presetSerializers.toMutableMap() - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(InternalSerializationApi::class) override val descriptor: SerialDescriptor = buildSerialDescriptor( "TypedSerializer", SerialKind.CONTEXTUAL @@ -21,8 +20,7 @@ open class TypedSerializer( element("value", ContextualSerializer(kClass).descriptor) } - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override fun deserialize(decoder: Decoder): T { return decoder.decodeStructure(descriptor) { var type: String? = null @@ -46,14 +44,12 @@ open class TypedSerializer( } } - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) protected open fun CompositeEncoder.encode(value: O) { encodeSerializableElement(descriptor, 1, value::class.serializer() as KSerializer, value) } - @ExperimentalSerializationApi - @InternalSerializationApi + @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class) override fun serialize(encoder: Encoder, value: T) { encoder.encodeStructure(descriptor) { val valueSerializer = value::class.serializer() From 50386adf708d37b26746707ea03ece24c726df48 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 28 Dec 2021 21:19:47 +0600 Subject: [PATCH 3/6] ignore kotlin-js-store folder --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b13f70aec8f..90dd34230e7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,6 @@ out/ secret.gradle local.properties - +kotlin-js-store publishing.sh From bd783fb74f02ddafb3f61e765216bae8f5504c49 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 29 Dec 2021 17:44:45 +0600 Subject: [PATCH 4/6] update dokka --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0baff625e3a..8581ddf9b26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,7 +40,7 @@ crypto_js_version=4.1.1 # Dokka -dokka_version=1.5.31 +dokka_version=1.6.0 # Project data From 02d02fa8f2ce770109e4a2c5168698683083b091 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 29 Dec 2021 19:24:25 +0600 Subject: [PATCH 5/6] update android tools build --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8c99154a4e6..3ac12d3ecec 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.0.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version" From e80676d3d201b0b2bcd83c48a8f3a69ebc4c88fe Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 29 Dec 2021 19:43:19 +0600 Subject: [PATCH 6/6] Update packages_push.yml --- .github/workflows/packages_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packages_push.yml b/.github/workflows/packages_push.yml index 8a161775c4a..f42c2d5a8e0 100644 --- a/.github/workflows/packages_push.yml +++ b/.github/workflows/packages_push.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Fix android 32.0.0 dx continue-on-error: true run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib && mv d8.jar dx.jar