From bb7a1b1e0572db91c1c203ad667aa553d17c4557 Mon Sep 17 00:00:00 2001 From: "Evgeniy.Zhelenskiy" Date: Sat, 27 Apr 2024 03:04:10 +0200 Subject: [PATCH] Move serializers to package com.zhelenskiy.serialization --- .gitignore | 2 +- build.gradle.kts | 6 +++++- gradle.properties | 2 +- module.yaml | 2 +- .../zhelenskiy/serialization}/DelegateSerializer.kt | 2 ++ test/ClassTests.kt | 3 +++ test/DelegateTests.kt | 4 +++- 7 files changed, 16 insertions(+), 5 deletions(-) rename src/{ => com/zhelenskiy/serialization}/DelegateSerializer.kt (97%) diff --git a/.gitignore b/.gitignore index 51dc565..e9ee575 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,4 @@ bin/ .DS_Store -src/ClassSerializer.kt \ No newline at end of file +src/com/zhelenskiy/serialization/ClassSerializer.kt \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 40b7f29..3d91402 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -89,6 +89,8 @@ fun generateClassSerializers() = buildString { } +"@file:Suppress(\"DuplicatedCode\")" +"" + +"package com.zhelenskiy.serialization" + +"" +"import kotlinx.serialization.ExperimentalSerializationApi" +"import kotlinx.serialization.KSerializer" +"import kotlinx.serialization.descriptors.SerialDescriptor" @@ -124,9 +126,11 @@ fun generateClassSerializers() = buildString { } } +fun File.withCreatedParentDirectories() = apply { parentFile?.mkdirs() } + tasks.register("generateClassSerializers") { val sourceFile = generateClassSerializers() - projectDir.resolve("src/ClassSerializer.kt").writeText(sourceFile) + projectDir.resolve("src/com/zhelenskiy/serialization/ClassSerializer.kt").withCreatedParentDirectories().writeText(sourceFile) } tasks.withType { diff --git a/gradle.properties b/gradle.properties index b688aee..0d8cfdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -kotlin.daemon.jvmargs=-Xmx1G \ No newline at end of file +kotlin.daemon.jvmargs=-Xmx4G diff --git a/module.yaml b/module.yaml index 24d54ad..2a605fd 100644 --- a/module.yaml +++ b/module.yaml @@ -12,4 +12,4 @@ settings: jvm: target: 1.8 kotlin: - serialization: json \ No newline at end of file + serialization: json diff --git a/src/DelegateSerializer.kt b/src/com/zhelenskiy/serialization/DelegateSerializer.kt similarity index 97% rename from src/DelegateSerializer.kt rename to src/com/zhelenskiy/serialization/DelegateSerializer.kt index 63052f6..23d31f3 100644 --- a/src/DelegateSerializer.kt +++ b/src/com/zhelenskiy/serialization/DelegateSerializer.kt @@ -1,3 +1,5 @@ +package com.zhelenskiy.serialization + import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.PrimitiveKind diff --git a/test/ClassTests.kt b/test/ClassTests.kt index 1e0f4a3..ba9877b 100644 --- a/test/ClassTests.kt +++ b/test/ClassTests.kt @@ -1,3 +1,6 @@ +import com.zhelenskiy.serialization.ClassKSerializer2 +import com.zhelenskiy.serialization.Property +import com.zhelenskiy.serialization.classSerializer import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer diff --git a/test/DelegateTests.kt b/test/DelegateTests.kt index 6af5db6..d72567f 100644 --- a/test/DelegateTests.kt +++ b/test/DelegateTests.kt @@ -1,3 +1,5 @@ +import com.zhelenskiy.serialization.DelegatedKSerializer +import com.zhelenskiy.serialization.delegatedSerializer import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.ListSerializer @@ -10,7 +12,7 @@ import kotlin.test.assertEquals class DelegateTests { @Test fun primitiveDelegate() { - val int2String = delegatedSerializer( + val int2String = delegatedSerializer( delegate = String.Companion.serializer(), descriptorName = "MyInt1", save = { "-$it" },