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 diff --git a/.gitignore b/.gitignore index 8a04b36aa50..90dd34230e7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,6 @@ out/ secret.gradle local.properties +kotlin-js-store 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/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" 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 11b070657eb..8581ddf9b26 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.2 -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 @@ -40,10 +40,10 @@ crypto_js_version=4.1.1 # Dokka -dokka_version=1.5.31 +dokka_version=1.6.0 # Project data group=dev.inmo -version=0.8.9 -android_code_version=89 +version=0.9.0 +android_code_version=90 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()