a little update

2020-11-25 13:53:15 +06:00
parent 570ca331fd
commit 08c6808706
167 changed files with 525 additions and 5648 deletions
--- a/publishing/ktor/client/build.gradle
+++ b/publishing/ktor/client/build.gradle
@@ -8,7 +8,6 @@ buildscript {
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
    }
 }

@@ -41,13 +40,9 @@ kotlin {
            dependencies {
                implementation kotlin('stdlib')

-                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
-                    api "com.insanusmokrassar:postssystem.core.ktor.common:$core_version"
-                    api "com.insanusmokrassar:postssystem.ktor.client:$core_version"
-                } else {
-                    api projectByName("publishing.ktor.common")
-                    api projectByName("ktor.client")
-                }
+                api "dev.inmo:micro_utils.ktor.client:$microutils_version"
+
+                api project(":postssystem.publishing.ktor.common")
            }
        }
        commonTest {
--- a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/ReadPublishingKeysRepoKtorClient.kt
+++ b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/ReadPublishingKeysRepoKtorClient.kt
@@ -3,10 +3,10 @@ package com.insanusmokrassar.postssystem.publishing.ktor.client
 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey
 import com.insanusmokrassar.postssystem.core.publishing.repos.ReadPublishingKeysRepo
-import com.insanusmokrassar.postssystem.ktor.buildStandardUrl
-import com.insanusmokrassar.postssystem.ktor.client.uniget
 import com.insanusmokrassar.postssystem.publishing.ktor.getPostIdByTriggerControlKeyRoute
 import com.insanusmokrassar.postssystem.publishing.ktor.getTriggerControlKeyByPostIdRoute
+import dev.inmo.micro_utils.ktor.client.uniget
+import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import io.ktor.client.HttpClient
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.builtins.serializer
--- a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/WritePublishingKeysRepoKtorClient.kt
+++ b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/WritePublishingKeysRepoKtorClient.kt
@@ -3,10 +3,10 @@ package com.insanusmokrassar.postssystem.publishing.ktor.client
 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey
 import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKeysRepo
-import com.insanusmokrassar.postssystem.ktor.buildStandardUrl
-import com.insanusmokrassar.postssystem.ktor.client.BodyPair
-import com.insanusmokrassar.postssystem.ktor.client.unipost
 import com.insanusmokrassar.postssystem.publishing.ktor.*
+import dev.inmo.micro_utils.ktor.client.BodyPair
+import dev.inmo.micro_utils.ktor.client.unipost
+import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import io.ktor.client.HttpClient
 import kotlinx.serialization.builtins.serializer

--- a/publishing/ktor/common/build.gradle
+++ b/publishing/ktor/common/build.gradle
@@ -8,7 +8,6 @@ buildscript {
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
    }
 }

@@ -39,13 +38,9 @@ kotlin {
            dependencies {
                implementation kotlin('stdlib')

-                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
-                    api "com.insanusmokrassar:postssystem.ktor.common:$core_version"
-                    api "com.insanusmokrassar:postssystem.publishing.api:$core_version"
-                } else {
-                    api projectByName("ktor.common")
-                    api projectByName("publishing.api")
-                }
+                api "dev.inmo:micro_utils.ktor.common:$microutils_version"
+
+                api project(":postssystem.publishing.api")
            }
        }
        commonTest {
@@ -54,21 +49,11 @@ kotlin {
                implementation kotlin('test-annotations-common')
            }
        }
-        jvmMain {
-            dependencies {
-                implementation kotlin('stdlib-jdk8')
-            }
-        }
        jvmTest {
            dependencies {
                implementation kotlin('test-junit')
            }
        }
-        jsMain {
-            dependencies {
-                implementation kotlin('stdlib-js')
-            }
-        }
        jsTest {
            dependencies {
                implementation kotlin('test-js')
--- a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/Serializers.kt
+++ b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/Serializers.kt
@@ -1,6 +1,9 @@
 package com.insanusmokrassar.postssystem.publishing.ktor

-import com.insanusmokrassar.postssystem.ktor.setIdsSerializer
+import com.insanusmokrassar.postssystem.core.post.PostId
+import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey
+import kotlinx.serialization.builtins.SetSerializer
+import kotlinx.serialization.builtins.serializer

-val postsIdSerializer = setIdsSerializer
-val triggerControlKeysSerializer = setIdsSerializer
+val postsIdSerializer = SetSerializer(PostId.serializer())
+val triggerControlKeysSerializer = SetSerializer(TriggerControlKey.serializer())
--- a/publishing/ktor/server/build.gradle
+++ b/publishing/ktor/server/build.gradle
@@ -8,7 +8,6 @@ buildscript {
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
    }
 }

@@ -32,8 +31,9 @@ repositories {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

-    api projectByName("publishing.ktor.common")
-    api projectByName("ktor.server")
+    api "dev.inmo:micro_utils.ktor.server:$microutils_version"
+
+    api project(":postssystem.publishing.ktor.common")

    testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
    testImplementation "org.jetbrains.kotlin:kotlin-test"
--- a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/PublishingKeysRepoRoutingConfigurator.kt
+++ b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/PublishingKeysRepoRoutingConfigurator.kt
@@ -1,8 +1,8 @@
 package com.insanusmokrassar.postssystem.publishing.ktor.server

 import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
 import com.insanusmokrassar.postssystem.publishing.ktor.publishingKeysRootRoute
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
 import io.ktor.routing.Route
 import io.ktor.routing.route

--- a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/ReadPublishingKeysRepoRoutingConfigurator.kt
+++ b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/ReadPublishingKeysRepoRoutingConfigurator.kt
@@ -3,11 +3,11 @@ package com.insanusmokrassar.postssystem.publishing.ktor.server
 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey
 import com.insanusmokrassar.postssystem.core.publishing.repos.ReadPublishingKeysRepo
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
-import com.insanusmokrassar.postssystem.ktor.server.getParameterOrSendError
-import com.insanusmokrassar.postssystem.ktor.server.unianswer
 import com.insanusmokrassar.postssystem.publishing.ktor.getPostIdByTriggerControlKeyRoute
 import com.insanusmokrassar.postssystem.publishing.ktor.getTriggerControlKeyByPostIdRoute
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.getParameterOrSendError
+import dev.inmo.micro_utils.ktor.server.unianswer
 import io.ktor.application.call
 import io.ktor.routing.Route
 import io.ktor.routing.get
--- a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/WritePublishingKeysRepoRoutingConfigurator.kt
+++ b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/WritePublishingKeysRepoRoutingConfigurator.kt
@@ -2,9 +2,9 @@ package com.insanusmokrassar.postssystem.publishing.ktor.server

 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKeysRepo
-import com.insanusmokrassar.postssystem.ktor.server.unianswer
-import com.insanusmokrassar.postssystem.ktor.server.uniload
 import com.insanusmokrassar.postssystem.publishing.ktor.*
+import dev.inmo.micro_utils.ktor.server.unianswer
+import dev.inmo.micro_utils.ktor.server.uniload
 import io.ktor.application.call
 import io.ktor.routing.Route
 import io.ktor.routing.post