a little update

business_cases/post_creating/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"
     }
 }
 
@@ -39,8 +38,9 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                api projectByName("business_cases.post_creating.common")
+
-                api projectByName("core.ktor.client")
+                api project(":postssystem.business_cases.post_creating.common")
+                api project(":postssystem.core.ktor.client")
             }
         }
         commonTest {

business_cases/post_creating/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt

@@ -4,9 +4,9 @@ import com.insanusmokrassar.postssystem.business_cases.post_creating.server.*
 import com.insanusmokrassar.postssystem.core.content.Content
 import com.insanusmokrassar.postssystem.core.post.RegisteredPost
 import com.insanusmokrassar.postssystem.core.publishing.TriggerId
-import com.insanusmokrassar.postssystem.ktor.buildStandardUrl
+import dev.inmo.micro_utils.ktor.client.BodyPair
-import com.insanusmokrassar.postssystem.ktor.client.BodyPair
+import dev.inmo.micro_utils.ktor.client.unipost
-import com.insanusmokrassar.postssystem.ktor.client.unipost
+import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import io.ktor.client.HttpClient
 
 class PostCreatingClientCase(

business_cases/post_creating/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,8 +38,8 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                api projectByName("core.ktor.common")
+                api project(":postssystem.core.ktor.common")
-                api projectByName("publishing.ktor.common")
+                api project(":postssystem.publishing.ktor.common")
             }
         }
         commonTest {

business_cases/post_creating/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,8 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    api projectByName("business_cases.post_creating.common")
+    api project(":postssystem.business_cases.post_creating.common")
-    api projectByName("core.ktor.server")
+    api project(":postssystem.core.ktor.server")
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test"

business_cases/post_creating/server/src/main/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt

@@ -1,8 +1,8 @@
 package com.insanusmokrassar.postssystem.business_cases.post_creating.server
 
 import com.insanusmokrassar.postssystem.core.post.RegisteredPost
-import com.insanusmokrassar.postssystem.ktor.server.unianswer
+import dev.inmo.micro_utils.ktor.server.unianswer
-import com.insanusmokrassar.postssystem.ktor.server.uniload
+import dev.inmo.micro_utils.ktor.server.uniload
 import io.ktor.application.call
 import io.ktor.routing.*
 import kotlinx.serialization.builtins.nullable

core/api/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"
     }
 }
 
@@ -42,13 +41,10 @@ kotlin {
                 implementation kotlin('stdlib')
                 api kotlin('reflect')
 
-                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
+                api "com.soywiz.korlibs.klock:klock:$klockVersion"
-                    api "com.insanusmokrassar:postssystem.utils.common:$core_version"
+                api "dev.inmo:micro_utils.common:$microutils_version"
-                    api "com.insanusmokrassar:postssystem.utils.repos.common:$core_version"
+                api "dev.inmo:micro_utils.repos.common:$microutils_version"
-                } else {
+                api "dev.inmo:micro_utils.mime_types:$microutils_version"
-                    api projectByName("utils.common")
-                    api projectByName("utils.repos.common")
-                }
             }
         }
         commonTest {
@@ -57,21 +53,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')

core/api/maven.publish.gradle

@@ -1,64 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom.withXml {
-            asNode().children().last() + {
-                resolveStrategy = Closure.DELEGATE_FIRST
-
-                description "Core library for PostsSystem"
-                name "PostsSystem Core"
-                url "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore"
-
-                scm {
-                    developerConnection "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git[push=]https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git"
-                    url "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git"
-                }
-
-                developers {
-                    
-                        developer {
-                            id "InsanusMokrassar"
-                            name "Ovsiannikov Aleksei"
-                            email "ovsyannikov.alexey95@gmail.com"
-                        }
-                    
-
-                        developer {
-                            id "mi-ast"
-                            name "Michail Astafiev"
-                            email "astaf65@gmail.com"
-                        }
-                    
-                }
-
-                licenses {
-                    
-                        license {
-                            name "Apache Software License 2.0"
-                            url "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore/src/master/LICENSE"
-                        }
-                    
-                }
-            }
-        }
-    }
-}

core/api/publish.gradle

@@ -1,55 +1,76 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-apply from: "maven.publish.gradle"
+task javadocsJar(type: Jar) {
-
+    classifier = 'javadoc'
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
 }
 
-bintrayUpload.doFirst {
+afterEvaluate {
-    publications = publishing.publications.collect {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
-            null
+            artifactId = "${project.name}"
+            artifact sourceJar
         } else {
-            it.name
+            artifactId = "${project.name}-$name"
+        }
     }
-    } - null
 }
 
-bintrayUpload.dependsOn publishToMavenLocal
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Core library for PostsSystem"
+            name = "PostsSystem Core"
+            url = "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git[push=]https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git"
+                url = "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+
+                    developer {
+                        id = "mi-ast"
+                        name = "Michail Astafiev"
+                        email = "astaf65@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore/src/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/DateTimeUtils.kt

@@ -0,0 +1,7 @@
+package com.insanusmokrassar.postssystem.core
+
+import com.soywiz.klock.DateTime
+
+typealias UnixMillis = Double
+val MIN_DATE = DateTime(Double.MIN_VALUE)
+val MAX_DATE = DateTime(Double.MAX_VALUE)

core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/IdUtils.kt

@@ -1,8 +1,9 @@
 package com.insanusmokrassar.postssystem.core
 
+import com.benasher44.uuid.uuid4
 import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.post.PostId
-import com.insanusmokrassar.postssystem.utils.repos.generateId
 
+fun generateId() = uuid4().toString()
 fun generatePostId(): PostId = generateId()
 fun generateContentId(): ContentId = generateId()

core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/Content.kt

@@ -1,6 +1,9 @@
 package com.insanusmokrassar.postssystem.core.content
 
-import com.insanusmokrassar.postssystem.utils.common.*
+import dev.inmo.micro_utils.common.ByteArrayAllocator
+import dev.inmo.micro_utils.common.ByteArrayAllocatorSerializer
+import dev.inmo.micro_utils.mime_types.KnownMimeTypes
+import dev.inmo.micro_utils.mime_types.MimeType
 import kotlinx.serialization.Serializable
 
 typealias ContentId = String

core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ReadContentRepo.kt

@@ -2,8 +2,8 @@ package com.insanusmokrassar.postssystem.core.content.api
 
 import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.content.RegisteredContent
-import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination
+import dev.inmo.micro_utils.pagination.Pagination
-import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
+import dev.inmo.micro_utils.pagination.PaginationResult
 
 /**
  * Simple read API by different properties of [com.insanusmokrassar.postssystem.core.content.Content].

core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/Post.kt

@@ -1,7 +1,7 @@
 package com.insanusmokrassar.postssystem.core.post
 
+import com.insanusmokrassar.postssystem.core.UnixMillis
 import com.insanusmokrassar.postssystem.core.content.ContentId
-import com.insanusmokrassar.postssystem.utils.common.UnixMillis
 import com.soywiz.klock.DateTime
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/ReadPostsRepo.kt

@@ -1,12 +1,12 @@
 package com.insanusmokrassar.postssystem.core.post.repo
 
+import com.insanusmokrassar.postssystem.core.MAX_DATE
+import com.insanusmokrassar.postssystem.core.MIN_DATE
 import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.post.RegisteredPost
-import com.insanusmokrassar.postssystem.utils.common.MAX_DATE
-import com.insanusmokrassar.postssystem.utils.common.MIN_DATE
-import com.insanusmokrassar.postssystem.utils.common.pagination.*
 import com.soywiz.klock.DateTime
+import dev.inmo.micro_utils.pagination.*
 
 /**
  * Simple read API by different properties

core/exposed/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"
     }
 }
 
@@ -33,14 +32,11 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
+    api "dev.inmo:micro_utils.repos.exposed:$microutils_version"
-        api "com.insanusmokrassar:postssystem.core.api:$core_version"
-        api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
-    } else {
-        api projectByName("core.api")
-        api projectByName("exposed.commons")
-    }
 
+    api project(":postssystem.core.api")
+
+    testImplementation "org.jetbrains.exposed:exposed-jdbc:$exposed_version"
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"

core/exposed/maven.publish.gradle

@@ -1,56 +0,0 @@
-apply plugin: 'maven-publish'
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-task javadocJar(type: Jar) {
-    from javadoc
-    classifier = 'javadoc'
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom.withXml {
-                asNode().children().last() + {
-                    resolveStrategy = Closure.DELEGATE_FIRST
-
-                    description "Exposed realisation for PostsSystem Core"
-                    name "PostsSystem Core Exposed realization"
-                    url "https://git.insanusmokrassar.com/PostsSystem/Core/"
-
-                    scm {
-                        developerConnection "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                        url "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                    }
-
-                    developers {
-                        
-                            developer {
-                                id "InsanusMokrassar"
-                                name "Ovsiannikov Aleksei"
-                                email "ovsyannikov.alexey95@gmail.com"
-                            }
-                        
-                    }
-
-                    licenses {
-                        
-                            license {
-                                name "Apache Software License 2.0"
-                                url "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
-                            }
-                        
-                    }
-                }
-            }
-        }
-    }
-}

core/exposed/publish.gradle

@@ -1,39 +1,66 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-ext {
+task sourcesJar(type: Jar) {
-    projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}"
+    from sourceSets.main.allSource
+    classifier = 'sources'
 }
 
-bintray {
+task javadocJar(type: Jar) {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+    from javadoc
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+    classifier = 'javadoc'
-    publications = ["maven"]
-    filesSpec {
-        into "$projectBintrayDir"
-        from("build/libs") {
-            include "**/*.asc"
 }
-        from("build/publications/maven") {
+
-            rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1"
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                resolveStrategy = Closure.DELEGATE_FIRST
+
+                description = "Exposed realisation for PostsSystem Core"
+                name = "PostsSystem Core Exposed realization"
+                url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
+
+                scm {
+                    developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+                    url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+                }
+
+                developers {
+                    
+                        developer {
+                            id = "InsanusMokrassar"
+                            name = "Ovsiannikov Aleksei"
+                            email = "ovsyannikov.alexey95@gmail.com"
+                        }
+                    
+                }
+
+                licenses {
+                    
+                        license {
+                            name = "Apache Software License 2.0"
+                            url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
+                        }
+                    
                 }
             }
-    pkg {
+            
-        repo = "InsanusMokrassar"
+                repositories {
-        name = "${project.name}"
+                    maven {
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
+                        name = "bintray"
-        licenses = ["Apache-2.0"]
+                        url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0")
-        version {
+                        credentials {
-            name = "${project.version}"
+                            username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-            released = new Date()
+                            password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
                         }
                     }
                 }
             
-apply from: "maven.publish.gradle"
+        }
-
+    }
-bintrayUpload.dependsOn publishToMavenLocal
+}

core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentRepo.kt

@@ -4,8 +4,7 @@ import com.insanusmokrassar.postssystem.core.content.*
 import com.insanusmokrassar.postssystem.core.content.api.ContentRepo
 import com.insanusmokrassar.postssystem.core.exposed.content.*
 import com.insanusmokrassar.postssystem.core.generateContentId
-import com.insanusmokrassar.postssystem.exposed.commons.paginate
+import dev.inmo.micro_utils.pagination.*
-import com.insanusmokrassar.postssystem.utils.common.pagination.*
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow

core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepo.kt

@@ -4,9 +4,8 @@ import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.generatePostId
 import com.insanusmokrassar.postssystem.core.post.*
 import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo
-import com.insanusmokrassar.postssystem.exposed.commons.paginate
-import com.insanusmokrassar.postssystem.utils.common.pagination.*
 import com.soywiz.klock.*
+import dev.inmo.micro_utils.pagination.*
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow

core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/BinaryContentHolderRepo.kt

@@ -2,7 +2,7 @@ package com.insanusmokrassar.postssystem.core.exposed.content
 
 import com.insanusmokrassar.postssystem.core.content.BinaryContent
 import com.insanusmokrassar.postssystem.core.content.ContentId
-import com.insanusmokrassar.postssystem.utils.common.mimeType
+import dev.inmo.micro_utils.mime_types.mimeType
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.statements.api.ExposedBlob
 import org.jetbrains.exposed.sql.transactions.transaction

core/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,10 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
+                api "dev.inmo:micro_utils.pagination.ktor.common:$microutils_version"
-                    api "com.insanusmokrassar:postssystem.core.ktor.common:$core_version"
+                api "dev.inmo:micro_utils.ktor.client:$microutils_version"
-                    api "com.insanusmokrassar:postssystem.ktor.client:$core_version"
+
-                } else {
+                api project(":postssystem.core.ktor.common")
-                    api projectByName("core.ktor.common")
-                    api projectByName("ktor.client")
-                }
             }
         }
         commonTest {

core/ktor/client/publish.gradle

@@ -0,0 +1,69 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
+
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
+        if (it.name.contains('kotlinMultiplatform')) {
+            artifactId = "${project.name}"
+            artifact sourceJar
+        } else {
+            artifactId = "${project.name}-$name"
+        }
+    }
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Exposed realisation for PostsSystem Core"
+            name = "PostsSystem Core Exposed realization"
+            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

core/ktor/client/publish_config.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"JVM"}
+{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt

@@ -4,10 +4,10 @@ import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.content.RegisteredContent
 import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
 import com.insanusmokrassar.postssystem.core.ktor.*
-import com.insanusmokrassar.postssystem.ktor.*
+import dev.inmo.micro_utils.ktor.client.uniget
-import com.insanusmokrassar.postssystem.ktor.client.uniget
+import dev.inmo.micro_utils.ktor.common.includeQueryParams
-import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination
+import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
-import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
+import dev.inmo.micro_utils.pagination.*
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.serialization.builtins.nullable

core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt

@@ -3,7 +3,7 @@ package com.insanusmokrassar.postssystem.core.ktor.client.content
 import com.insanusmokrassar.postssystem.core.content.*
 import com.insanusmokrassar.postssystem.core.content.api.WriteContentRepo
 import com.insanusmokrassar.postssystem.core.ktor.*
-import com.insanusmokrassar.postssystem.ktor.client.*
+import dev.inmo.micro_utils.ktor.client.*
 import io.ktor.client.HttpClient
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.builtins.nullable

core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt

@@ -5,11 +5,11 @@ import com.insanusmokrassar.postssystem.core.ktor.*
 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.post.RegisteredPost
 import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
-import com.insanusmokrassar.postssystem.ktor.*
-import com.insanusmokrassar.postssystem.ktor.client.uniget
-import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination
-import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
 import com.soywiz.klock.DateTime
+import dev.inmo.micro_utils.ktor.client.uniget
+import dev.inmo.micro_utils.ktor.common.asFromToUrlPart
+import dev.inmo.micro_utils.ktor.common.buildStandardUrl
+import dev.inmo.micro_utils.pagination.*
 import io.ktor.client.HttpClient
 import kotlinx.serialization.builtins.nullable
 

core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt

@@ -3,7 +3,7 @@ package com.insanusmokrassar.postssystem.core.ktor.client.post
 import com.insanusmokrassar.postssystem.core.ktor.*
 import com.insanusmokrassar.postssystem.core.post.*
 import com.insanusmokrassar.postssystem.core.post.repo.WritePostsRepo
-import com.insanusmokrassar.postssystem.ktor.client.*
+import dev.inmo.micro_utils.ktor.client.*
 import io.ktor.client.HttpClient
 import io.ktor.client.features.websocket.WebSockets
 import kotlinx.coroutines.flow.Flow

core/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"
     }
 }
 
@@ -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 "dev.inmo:micro_utils.ktor.common:$microutils_version"
-                    api "com.insanusmokrassar:postssystem.ktor.common:$core_version"
+
-                    api "com.insanusmokrassar:postssystem.core.api:$core_version"
+                api project(":postssystem.core.api")
-                } else {
-                    api projectByName("ktor.common")
-                    api projectByName("core.api")
-                }
             }
         }
         commonTest {

core/ktor/common/publish.gradle

@@ -0,0 +1,69 @@
+apply plugin: 'maven-publish'
+
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
+}
+task sourceJar (type : Jar) {
+    classifier = 'sources'
+}
+
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
+        if (it.name.contains('kotlinMultiplatform')) {
+            artifactId = "${project.name}"
+            artifact sourceJar
+        } else {
+            artifactId = "${project.name}-$name"
+        }
+    }
+}
+
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Exposed realisation for PostsSystem Core"
+            name = "PostsSystem Core Exposed realization"
+            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

core/ktor/common/publish_config.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"JVM"}
+{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/Serializers.kt

@@ -1,13 +1,14 @@
 package com.insanusmokrassar.postssystem.core.ktor
 
+import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.content.RegisteredContent
+import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.post.RegisteredPost
-import com.insanusmokrassar.postssystem.ktor.setIdsSerializer
+import dev.inmo.micro_utils.pagination.PaginationResult
-import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
+import kotlinx.serialization.builtins.*
-import kotlinx.serialization.builtins.ListSerializer
 
-val contentIdsSerializer = setIdsSerializer
+val contentIdsSerializer = SetSerializer(ContentId.serializer())
-val postIdsSerializer = setIdsSerializer
+val postIdsSerializer = SetSerializer(PostId.serializer())
 val registeredPostsListSerializer = ListSerializer(RegisteredPost.serializer())
 val registeredPostsPaginationResultSerializer = PaginationResult.serializer(RegisteredPost.serializer())
 val registeredContentPaginationResultSerializer = PaginationResult.serializer(RegisteredContent.serializer())

core/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,10 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    api projectByName("core.ktor.common")
+    api "dev.inmo:micro_utils.pagination.ktor.server:$microutils_version"
-    api projectByName("ktor.server")
+    api "dev.inmo:micro_utils.ktor.server:$microutils_version"
+
+    api project(":postssystem.core.ktor.common")
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test"

core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt

@@ -2,7 +2,7 @@ package com.insanusmokrassar.postssystem.core.ktor.server.content
 
 import com.insanusmokrassar.postssystem.core.content.api.ContentRepo
 import com.insanusmokrassar.postssystem.core.ktor.contentRootRoute
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
 import io.ktor.routing.Route
 import io.ktor.routing.route
 

core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt

@@ -4,8 +4,10 @@ import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.content.RegisteredContent
 import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
 import com.insanusmokrassar.postssystem.core.ktor.*
-import com.insanusmokrassar.postssystem.ktor.server.*
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.getParameterOrSendError
+import dev.inmo.micro_utils.ktor.server.unianswer
+import dev.inmo.micro_utils.pagination.extractPagination
 import io.ktor.application.call
 import io.ktor.routing.Route
 import io.ktor.routing.get

core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt

@@ -3,8 +3,8 @@ package com.insanusmokrassar.postssystem.core.ktor.server.content
 import com.insanusmokrassar.postssystem.core.content.*
 import com.insanusmokrassar.postssystem.core.content.api.WriteContentRepo
 import com.insanusmokrassar.postssystem.core.ktor.*
-import com.insanusmokrassar.postssystem.ktor.server.*
+import dev.inmo.micro_utils.ktor.server.*
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
 import io.ktor.application.call
 import io.ktor.routing.Route
 import io.ktor.routing.post

core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt

@@ -2,7 +2,7 @@ package com.insanusmokrassar.postssystem.core.ktor.server.post
 
 import com.insanusmokrassar.postssystem.core.ktor.postsRootRoute
 import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
 import io.ktor.routing.Route
 import io.ktor.routing.route
 

core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt

@@ -1,14 +1,15 @@
 package com.insanusmokrassar.postssystem.core.ktor.server.post
 
+import com.insanusmokrassar.postssystem.core.MAX_DATE
+import com.insanusmokrassar.postssystem.core.MIN_DATE
 import com.insanusmokrassar.postssystem.core.content.ContentId
 import com.insanusmokrassar.postssystem.core.ktor.*
 import com.insanusmokrassar.postssystem.core.post.PostId
 import com.insanusmokrassar.postssystem.core.post.RegisteredPost
 import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
-import com.insanusmokrassar.postssystem.ktor.server.*
+import dev.inmo.micro_utils.ktor.server.*
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
-import com.insanusmokrassar.postssystem.utils.common.MAX_DATE
+import dev.inmo.micro_utils.pagination.extractPagination
-import com.insanusmokrassar.postssystem.utils.common.MIN_DATE
 import io.ktor.application.call
 import io.ktor.routing.Route
 import io.ktor.routing.get

core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt

@@ -3,8 +3,8 @@ package com.insanusmokrassar.postssystem.core.ktor.server.post
 import com.insanusmokrassar.postssystem.core.ktor.*
 import com.insanusmokrassar.postssystem.core.post.*
 import com.insanusmokrassar.postssystem.core.post.repo.WritePostsRepo
-import com.insanusmokrassar.postssystem.ktor.server.*
+import dev.inmo.micro_utils.ktor.server.*
-import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
 import io.ktor.application.call
 import io.ktor.routing.Route
 import io.ktor.routing.post

exposed/commons/build.gradle

@@ -1,46 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        jcenter()
-        mavenCentral()
-    }
-
-    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"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-}
-
-project.version = "$core_version"
-project.group = "com.insanusmokrassar"
-
-apply plugin: "java-library"
-apply plugin: "kotlin"
-apply from: "./publish.gradle"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    api "org.jetbrains.exposed:exposed-core:$exposed_version"
-    api "org.jetbrains.exposed:exposed-jdbc:$exposed_version"
-
-    if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
-        api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
-    } else {
-        api projectByName("utils.repos.common")
-    }
-
-    testImplementation "org.jetbrains.kotlin:kotlin-test"
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
-}

exposed/commons/maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "Common utils for all exposed modules"
-            name = "PostsSystem Exposed commons"
-            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

exposed/commons/publish.gradle

@@ -1,55 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-apply from: "maven.publish.gradle"
-
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
-    }
-}
-
-bintrayUpload.doFirst {
-    publications = publishing.publications.collect {
-        if (it.name.contains('kotlinMultiplatform')) {
-            null
-        } else {
-            it.name
-        }
-    } - null
-}
-
-bintrayUpload.dependsOn publishToMavenLocal

exposed/commons/publish_config.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Exposed commons","description":"Common utils for all exposed modules","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

exposed/commons/src/main/kotlin/com/insanusmokrassar/postssystem/exposed/commons/QueryExtensions.kt

@@ -1,27 +0,0 @@
-package com.insanusmokrassar.postssystem.exposed.commons
-
-import com.insanusmokrassar.postssystem.utils.common.pagination.*
-import org.jetbrains.exposed.sql.*
-
-fun Query.paginate(with: Pagination, orderBy: Pair<Expression<*>, SortOrder>? = null) = limit(
-    with.size,
-    (if (orderBy ?.second == SortOrder.DESC) {
-        with.lastIndex
-    } else {
-        with.firstIndex
-    }).toLong()
-).let {
-    if (orderBy != null) {
-        it.orderBy(
-            orderBy.first,
-            orderBy.second
-        )
-    } else {
-        it
-    }
-}
-
-fun Query.paginate(with: Pagination, orderBy: Expression<*>?, reversed: Boolean = false) = paginate(
-    with,
-    orderBy ?.let { it to if (reversed) SortOrder.DESC else SortOrder.ASC }
-)

gradle.properties

@@ -1,19 +1,19 @@
 kotlin.code.style=official
 org.gradle.parallel=true
-kotlin_version=1.4.10
+kotlin_version=1.4.20
-kotlin_coroutines_version=1.3.9
+kotlin_coroutines_version=1.4.1
-kotlin_serialisation_core_version=1.0.0-RC2
+kotlin_serialisation_core_version=1.0.1
 
-ktor_version=1.4.1
+ktor_version=1.4.2
 
-klockVersion=1.12.1
+klockVersion=2.0.0
-uuidVersion=0.2.2
+uuidVersion=0.2.3
 
-exposed_version=0.27.1
+exposed_version=0.28.1
 test_sqlite_version=3.32.3.2
 
+microutils_version=0.4.5
+
 javax_activation_version=1.1.1
 
-gradle_bintray_plugin_version=1.8.5
+core_version=0.6.0
-
-core_version=0.5.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

ktor/client/build.gradle

@@ -1,89 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        jcenter()
-        mavenCentral()
-    }
-
-    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"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-}
-
-project.version = "$core_version"
-project.group = "com.insanusmokrassar"
-
-apply from: "publish.gradle"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-}
-
-kotlin {
-    jvm()
-    js (BOTH) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            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"
-                } else {
-                    api projectByName("ktor.common")
-                }
-
-                api "io.ktor:ktor-client-core:$ktor_version"
-                api "io.ktor:ktor-client-websockets:$ktor_version"
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation kotlin('stdlib-jdk8')
-
-                api "io.ktor:ktor-client:$ktor_version"
-                api "io.ktor:ktor-client-websockets-jvm:$ktor_version"
-                api "io.ktor:ktor-client-okhttp:$ktor_version"
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation kotlin('stdlib-js')
-
-                api "io.ktor:ktor-client-js:$ktor_version"
-                api "io.ktor:ktor-client-websockets-js:$ktor_version"
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-                implementation kotlin('test-junit')
-            }
-        }
-    }
-}

ktor/client/maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "Common utils for all exposed modules"
-            name = "PostsSystem Exposed commons"
-            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

ktor/client/publish.gradle

@@ -1,55 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-apply from: "maven.publish.gradle"
-
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
-    }
-}
-
-bintrayUpload.doFirst {
-    publications = publishing.publications.collect {
-        if (it.name.contains('kotlinMultiplatform')) {
-            null
-        } else {
-            it.name
-        }
-    } - null
-}
-
-bintrayUpload.dependsOn publishToMavenLocal

ktor/client/publish_config.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Exposed commons","description":"Common utils for all exposed modules","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/FlowsWebsockets.kt

@@ -1,83 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.client
-
-import com.insanusmokrassar.postssystem.ktor.asCorrectWebSocketUrl
-import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat
-import com.insanusmokrassar.postssystem.utils.common.safely
-import io.ktor.client.HttpClient
-import io.ktor.client.features.websocket.ws
-import io.ktor.http.cio.websocket.Frame
-import io.ktor.http.cio.websocket.readBytes
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.serialization.DeserializationStrategy
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <T> HttpClient.createStandardWebsocketFlow(
-    url: String,
-    crossinline checkReconnection: (Throwable?) -> Boolean = { true },
-    crossinline conversation: suspend (ByteArray) -> T
-): Flow<T> {
-    val correctedUrl = url.asCorrectWebSocketUrl
-
-    return channelFlow {
-        val producerScope = this@channelFlow
-        do {
-            val reconnect = try {
-                safely(
-                    {
-                        throw it
-                    }
-                ) {
-                    ws(
-                        correctedUrl
-                    ) {
-                        while (true) {
-                            when (val received = incoming.receive()) {
-                                is Frame.Binary -> producerScope.send(
-                                    conversation(received.readBytes())
-                                )
-                                else -> {
-                                    producerScope.close()
-                                    return@ws
-                                }
-                            }
-                        }
-                    }
-                }
-                checkReconnection(null)
-            } catch (e: Throwable) {
-                checkReconnection(e).also {
-                    if (!it) {
-                        producerScope.close(e)
-                    }
-                }
-            }
-        } while (reconnect)
-        if (!producerScope.isClosedForSend) {
-            safely(
-                { /* do nothing */ }
-            ) {
-                producerScope.close()
-            }
-        }
-    }
-}
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <T> HttpClient.createStandardWebsocketFlow(
-    url: String,
-    crossinline checkReconnection: (Throwable?) -> Boolean = { true },
-    deserializer: DeserializationStrategy<T>
-) = createStandardWebsocketFlow(
-    url,
-    checkReconnection
-) {
-    standardKtorSerialFormat.decodeFromByteArray(deserializer, it)
-}
-

ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/StandardHttpClientGetPost.kt

@@ -1,33 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.client
-
-import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat
-import io.ktor.client.HttpClient
-import io.ktor.client.request.get
-import io.ktor.client.request.post
-import kotlinx.serialization.*
-
-typealias BodyPair<T> = Pair<SerializationStrategy<T>, T>
-
-suspend fun <ResultType> HttpClient.uniget(
-    url: String,
-    resultDeserializer: DeserializationStrategy<ResultType>
-) = get<ByteArray>(
-    url
-).let {
-    standardKtorSerialFormat.decodeFromByteArray(resultDeserializer, it)
-}
-
-fun <T> SerializationStrategy<T>.encodeUrlQueryValue(value: T) = standardKtorSerialFormat.encodeToHexString(
-    this,
-    value
-)
-
-suspend fun <BodyType, ResultType> HttpClient.unipost(
-    url: String,
-    bodyInfo: BodyPair<BodyType>,
-    resultDeserializer: DeserializationStrategy<ResultType>
-) = post<ByteArray>(url) {
-    body = standardKtorSerialFormat.encodeToByteArray(bodyInfo.first, bodyInfo.second)
-}.let {
-    standardKtorSerialFormat.decodeFromByteArray(resultDeserializer, it)
-}

ktor/common/build.gradle

@@ -1,79 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        jcenter()
-        mavenCentral()
-    }
-
-    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"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-}
-
-project.version = "$core_version"
-project.group = "com.insanusmokrassar"
-
-apply from: "publish.gradle"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-}
-
-kotlin {
-    jvm()
-    js (BOTH) {
-        browser()
-        nodejs()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version"
-
-                api projectByName("utils.common")
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation kotlin('stdlib-jdk8')
-//                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version"
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation kotlin('stdlib-js')
-//                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor-js:$kotlin_serialisation_core_version"
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-                implementation kotlin('test-junit')
-            }
-        }
-    }
-}

ktor/common/publish_config.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Exposed commons","description":"Common utils for all exposed modules","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/BuildStandardUrl.kt

@@ -1,23 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-fun buildStandardUrl(
-    basePart: String,
-    subpart: String,
-    parameters: QueryParams = emptyMap()
-) = "$basePart/$subpart".includeQueryParams(
-    parameters
-)
-
-fun buildStandardUrl(
-    basePart: String,
-    subpart: String,
-    parameters: List<QueryParam>
-) = "$basePart/$subpart".includeQueryParams(
-    parameters
-)
-
-fun buildStandardUrl(
-    basePart: String,
-    subpart: String,
-    vararg parameters: QueryParam
-) = buildStandardUrl(basePart, subpart, parameters.toList())

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/CollectionsSerializers.kt

@@ -1,6 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-import kotlinx.serialization.builtins.SetSerializer
-import kotlinx.serialization.builtins.serializer
-
-val setIdsSerializer = SetSerializer(String.serializer())

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/CorrectCloseException.kt

@@ -1,3 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-object CorrectCloseException : Exception()

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/CorrectWebsocketUrl.kt

@@ -1,14 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-private val schemaRegex = Regex("[^:]*//")
-
-val String.asCorrectWebSocketUrl: String
-    get() = if (startsWith("ws")) {
-        this
-    } else {
-        if (contains("://")) {
-            replace(schemaRegex, "ws://")
-        } else {
-            "ws://$this"
-        }
-    }

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/FromToDateTimeUrl.kt

@@ -1,17 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-import com.soywiz.klock.DateTime
-
-typealias FromToDateTime = Pair<DateTime?, DateTime?>
-
-val FromToDateTime.asFromToUrlPart: QueryParams
-    get() = mapOf(
-        "from" to first ?.unixMillis ?.toString(),
-        "to" to second ?.unixMillis ?.toString()
-    )
-
-val QueryParams.extractFromToDateTime: FromToDateTime
-    get() = FromToDateTime(
-        get("from") ?.toDoubleOrNull() ?.let { DateTime(it) },
-        get("to") ?.toDoubleOrNull() ?.let { DateTime(it) }
-    )

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/PaginationInUrl.kt

@@ -1,25 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-import com.insanusmokrassar.postssystem.utils.common.pagination.*
-
-private val numberRegex = Regex("[\\d]{1,10}")
-private val pageRegex = Regex("page=${numberRegex.pattern}")
-private val sizeRegex = Regex("size=${numberRegex.pattern}")
-
-val Pagination.asUrlQueryParts
-    get() = mapOf(
-        "page" to page.toString(),
-        "size" to size.toString()
-    )
-
-val Pagination.asUrlQueryArrayParts
-    get() = arrayOf(
-        "page" to page.toString(),
-        "size" to size.toString()
-    )
-
-val Map<String, String?>.extractPagination: Pagination
-    get() = SimplePagination(
-        get("page") ?.toIntOrNull() ?: 0,
-        get("size") ?.toIntOrNull() ?: defaultMediumPageSize
-    )

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/QueryParamsBuilder.kt

@@ -1,25 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-typealias QueryParam = Pair<String, String?>
-typealias QueryParams = Map<String, String?>
-
-val QueryParams.asUrlQuery: String
-    get() = keys.joinToString("&") { "${it}${get(it) ?.let { value -> "=$value" }}" }
-
-val List<QueryParam>.asUrlQuery: String
-    get() = joinToString("&") { (key, value) -> "${key}${value ?.let { _ -> "=$value" }}" }
-
-fun String.includeQueryParams(
-    queryParams: QueryParams
-): String = "$this${if (contains("?")) "&" else "?"}${queryParams.asUrlQuery}"
-
-fun String.includeQueryParams(
-    queryParams: List<QueryParam>
-): String = "$this${if (contains("?")) "&" else "?"}${queryParams.asUrlQuery}"
-
-val String.parseUrlQuery: QueryParams
-    get() = split("&").map {
-        it.split("=").let { pair ->
-            pair.first() to pair.getOrNull(1)
-        }
-    }.toMap()

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/StandardSerializer.kt

@@ -1,5 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-import kotlinx.serialization.cbor.Cbor
-
-val standardKtorSerialFormat = Cbor

ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/WebSockets.kt

@@ -1,7 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor
-
-const val clientWebsocketHelloMessage = "Start getting of updates"
-const val serverWebsocketHelloMessage = "Accepted"
-
-const val serverWebsocketNewMessageMessage = "NewMessage"
-const val websocketFinalizationMessage = "Final"

ktor/server/build.gradle

@@ -1,65 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        jcenter()
-        mavenCentral()
-    }
-
-    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"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-}
-
-project.version = "$core_version"
-project.group = "com.insanusmokrassar"
-
-apply from: "publish.gradle"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-}
-
-kotlin {
-    jvm()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-
-                api projectByName("ktor.common")
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-
-        jvmMain {
-            dependencies {
-                api "io.ktor:ktor-server:$ktor_version"
-                api "io.ktor:ktor-server-host-common:$ktor_version"
-                api "io.ktor:ktor-server-netty:$ktor_version"
-                api "io.ktor:ktor-websockets:$ktor_version"
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-    }
-}

ktor/server/maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "Common utils for all exposed modules"
-            name = "PostsSystem Exposed commons"
-            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

ktor/server/publish.gradle

@@ -1,55 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-apply from: "maven.publish.gradle"
-
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
-    }
-}
-
-bintrayUpload.doFirst {
-    publications = publishing.publications.collect {
-        if (it.name.contains('kotlinMultiplatform')) {
-            null
-        } else {
-            it.name
-        }
-    } - null
-}
-
-bintrayUpload.dependsOn publishToMavenLocal

ktor/server/publish_config.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Exposed commons","description":"Common utils for all exposed modules","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/FlowsWebsocket.kt

@@ -1,44 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server
-
-import com.insanusmokrassar.postssystem.ktor.CorrectCloseException
-import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat
-import com.insanusmokrassar.postssystem.utils.common.safely
-import io.ktor.http.cio.websocket.*
-import io.ktor.routing.Route
-import io.ktor.websocket.webSocket
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
-import kotlinx.serialization.SerializationStrategy
-
-private suspend fun DefaultWebSocketSession.checkReceivedAndCloseIfExists() {
-    if (incoming.poll() != null) {
-        close()
-        throw CorrectCloseException
-    }
-}
-
-fun <T> Route.includeWebsocketHandling(
-    suburl: String,
-    flow: Flow<T>,
-    converter: (T) -> ByteArray
-) {
-    webSocket(suburl) {
-        safely {
-            flow.collect {
-                checkReceivedAndCloseIfExists()
-                send(converter(it))
-            }
-        }
-    }
-}
-
-fun <T> Route.includeWebsocketHandling(
-    suburl: String,
-    flow: Flow<T>,
-    serializer: SerializationStrategy<T>
-) = includeWebsocketHandling(
-    suburl,
-    flow
-) {
-    standardKtorSerialFormat.encodeToByteArray(serializer, it)
-}

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/FromToDateTimeInUrl.kt

@@ -1,11 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server
-
-import com.insanusmokrassar.postssystem.ktor.FromToDateTime
-import com.soywiz.klock.DateTime
-import io.ktor.http.Parameters
-
-val Parameters.extractFromToDateTime: FromToDateTime
-    get() = FromToDateTime(
-        get("from") ?.toDoubleOrNull() ?.let { DateTime(it) },
-        get("to") ?.toDoubleOrNull() ?.let { DateTime(it) }
-    )

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/PaginationInUrl.kt

@@ -1,10 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server
-
-import com.insanusmokrassar.postssystem.utils.common.pagination.*
-import io.ktor.http.Parameters
-
-val Parameters.extractPagination: Pagination
-    get() = SimplePagination(
-        get("page") ?.toIntOrNull() ?: 0,
-        get("size") ?.toIntOrNull() ?: defaultMediumPageSize
-    )

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt

@@ -1,65 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server
-
-import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat
-import io.ktor.application.ApplicationCall
-import io.ktor.http.HttpStatusCode
-import io.ktor.response.respond
-import io.ktor.response.respondBytes
-import io.ktor.util.toByteArray
-import kotlinx.serialization.*
-
-suspend fun <T> ApplicationCall.unianswer(
-    answerSerializer: SerializationStrategy<T>,
-    answer: T
-) {
-    respondBytes(
-        standardKtorSerialFormat.encodeToByteArray(answerSerializer, answer),
-        standardKtorSerialFormatContentType
-    )
-}
-
-suspend fun <T> ApplicationCall.uniload(
-    deserializer: DeserializationStrategy<T>
-) = standardKtorSerialFormat.decodeFromByteArray(
-    deserializer,
-    request.receiveChannel().toByteArray()
-)
-
-suspend fun ApplicationCall.getParameterOrSendError(
-    field: String
-) = parameters[field].also {
-    if (it == null) {
-        respond(HttpStatusCode.BadRequest, "Request must contains $field")
-    }
-}
-
-fun ApplicationCall.getQueryParameter(
-    field: String
-) = request.queryParameters[field]
-
-suspend fun ApplicationCall.getQueryParameterOrSendError(
-    field: String
-) = getQueryParameter(field).also {
-    if (it == null) {
-        respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field")
-    }
-}
-
-fun <T> ApplicationCall.decodeUrlQueryValue(
-    field: String,
-    deserializer: DeserializationStrategy<T>
-) = getQueryParameter(field) ?.let {
-    standardKtorSerialFormat.decodeFromHexString(
-        deserializer,
-        it
-    )
-}
-
-suspend fun <T> ApplicationCall.decodeUrlQueryValueOrSendError(
-    field: String,
-    deserializer: DeserializationStrategy<T>
-) = decodeUrlQueryValue(field, deserializer).also {
-    if (it == null) {
-        respond(HttpStatusCode.BadRequest, "Request query parameters must contains $field")
-    }
-}

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/StartServer.kt

@@ -1,28 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server
-
-import io.ktor.application.Application
-import io.ktor.server.engine.*
-import io.ktor.server.netty.Netty
-import kotlin.random.Random
-
-fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configuration> createKtorServer(
-    engine: ApplicationEngineFactory<TEngine, TConfiguration>,
-    host: String = "localhost",
-    port: Int = Random.nextInt(1024, 65535),
-    block: Application.() -> Unit
-): TEngine {
-    val env = applicationEngineEnvironment {
-        module(block)
-        connector {
-            this@connector.host = host
-            this@connector.port = port
-        }
-    }
-    return embeddedServer(engine, env)
-}
-
-fun createKtorServer(
-    host: String = "localhost",
-    port: Int = Random.nextInt(1024, 65535),
-    block: Application.() -> Unit
-) = createKtorServer(Netty, host, port, block)

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt

@@ -1,21 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server.configurators
-
-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.features.CachingHeaders
-import kotlinx.serialization.Contextual
-
-data class ApplicationCachingHeadersConfigurator(
-    private val elements: List<@Contextual Element>
-) : KtorApplicationConfigurator{
-    interface Element { operator fun CachingHeaders.Configuration.invoke() }
-
-    override fun Application.configure() {
-        install(CachingHeaders) {
-            elements.forEach {
-                it.apply { invoke() }
-            }
-        }
-    }
-}
-

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationRoutingConfigurator.kt

@@ -1,27 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server.configurators
-
-import io.ktor.application.*
-import io.ktor.routing.Route
-import io.ktor.routing.Routing
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.Serializable
-
-@Serializable
-class ApplicationRoutingConfigurator(
-    private val elements: List<@Contextual Element>
-) : KtorApplicationConfigurator {
-    interface Element { operator fun Route.invoke() }
-
-    override fun Application.configure() {
-        try {
-            feature(Routing)
-        } catch (e: IllegalStateException) {
-            install(Routing) {
-                elements.forEach {
-                    it.apply { invoke() }
-                }
-            }
-        }
-    }
-}
-

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationSessionsConfigurator.kt

@@ -1,20 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server.configurators
-
-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.sessions.Sessions
-import kotlinx.serialization.Contextual
-
-class ApplicationSessionsConfigurator(
-    private val elements: List<@Contextual Element>
-) : KtorApplicationConfigurator {
-    interface Element { operator fun Sessions.Configuration.invoke() }
-
-    override fun Application.configure() {
-        install(Sessions) {
-            elements.forEach {
-                it.apply { invoke() }
-            }
-        }
-    }
-}

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/KtorApplicationConfigurator.kt

@@ -1,7 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server.configurators
-
-import io.ktor.application.Application
-
-interface KtorApplicationConfigurator {
-    fun Application.configure()
-}

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt

@@ -1,21 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server.configurators
-
-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.features.StatusPages
-import kotlinx.serialization.Contextual
-
-class StatusPagesConfigurator(
-    private val elements: List<@Contextual Element>
-) : KtorApplicationConfigurator {
-    interface Element { operator fun StatusPages.Configuration.invoke() }
-
-    override fun Application.configure() {
-        install(StatusPages) {
-            elements.forEach {
-                it.apply { invoke() }
-            }
-        }
-    }
-}
-

ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/standardKtorSerialFormatContentType.kt

@@ -1,5 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.server
-
-import io.ktor.http.ContentType
-
-val standardKtorSerialFormatContentType = ContentType.Application.Cbor

ktor/tests/build.gradle

@@ -1,39 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        jcenter()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-}
-
-project.version = "$core_version"
-project.group = "com.insanusmokrassar"
-
-apply plugin: "java-library"
-apply plugin: "kotlin"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    api projectByName("ktor.client")
-    api projectByName("ktor.server")
-
-    testImplementation "org.jetbrains.kotlin:kotlin-test"
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
-}

ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/TestsScope.kt

@@ -1,6 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.tests
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-
-val testsScope = CoroutineScope(Dispatchers.Default)

ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt

@@ -1,63 +0,0 @@
-package com.insanusmokrassar.postssystem.ktor.tests
-
-import com.insanusmokrassar.postssystem.ktor.client.createStandardWebsocketFlow
-import com.insanusmokrassar.postssystem.ktor.server.createKtorServer
-import com.insanusmokrassar.postssystem.ktor.server.includeWebsocketHandling
-import io.ktor.application.install
-import io.ktor.client.HttpClient
-import io.ktor.routing.routing
-import io.ktor.websocket.WebSockets
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.*
-import kotlinx.serialization.builtins.serializer
-import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertNull
-
-class WebsocketsTest {
-    @Test
-    fun testCommonWebsocketFunctionality() {
-        val port = 60000
-        val suburl = "test"
-        val dataFlowChannel = Channel<Int>(Channel.UNLIMITED)
-        val dataFlow = dataFlowChannel.consumeAsFlow()
-        val serverUrl = "127.0.0.1:$port"
-        val server = createKtorServer(host = "127.0.0.1", port = port) {
-            install(WebSockets)
-            routing {
-                includeWebsocketHandling(suburl, dataFlow, Int.serializer())
-            }
-        }.also {
-            it.start(false)
-        }
-        runBlocking {
-            delay(100L)
-        }
-        val client = HttpClient {
-            install(io.ktor.client.features.websocket.WebSockets)
-        }
-        val incomingWebsocketFlow = client.createStandardWebsocketFlow(
-            "$serverUrl/$suburl",
-            { false }, // always skip reconnection
-            deserializer = Int.serializer()
-        )
-
-        var currentlyCheckingData: Int? = null
-        incomingWebsocketFlow.onEach {
-            assertEquals(currentlyCheckingData, it)
-            currentlyCheckingData = null
-        }.launchIn(CoroutineScope(testsScope.coroutineContext + SupervisorJob()))
-        runBlocking {
-            (0 until 100).asFlow().collect {
-                currentlyCheckingData = it
-                dataFlowChannel.send(it)
-                while (currentlyCheckingData != null) {
-                    delay(10L)
-                }
-                assertNull(currentlyCheckingData)
-            }
-        }
-        server.stop(1000L, 1000L)
-    }
-}

publishing/api/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,11 +40,7 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
+                api project(":postssystem.core.api")
-                    api "com.insanusmokrassar:postssystem.core.api:$core_version"
-                } else {
-                    api projectByName("core.api")
-                }
             }
         }
         commonTest {

publishing/api/maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "Publishing subsystem with necessary functionality related to publish mechanism"
-            name = "PostsSystem Core Publishing subsystem"
-            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

publishing/api/publish.gradle

@@ -1,55 +1,69 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-apply from: "maven.publish.gradle"
+task javadocsJar(type: Jar) {
-
+    classifier = 'javadoc'
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
 }
 
-bintrayUpload.doFirst {
+afterEvaluate {
-    publications = publishing.publications.collect {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
-            null
+            artifactId = "${project.name}"
+            artifact sourceJar
         } else {
-            it.name
+            artifactId = "${project.name}-$name"
+        }
     }
-    } - null
 }
 
-bintrayUpload.dependsOn publishToMavenLocal
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Publishing subsystem with necessary functionality related to publish mechanism"
+            name = "PostsSystem Core Publishing subsystem"
+            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

publishing/exposed/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"
     }
 }
 
@@ -33,13 +32,9 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
+    api "dev.inmo:micro_utils.repos.exposed:$microutils_version"
-        api "com.insanusmokrassar:postssystem.core.publishing:$core_version"
+
-        api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
+    api project(":postssystem.publishing.api")
-    } else {
-        api projectByName("publishing.api")
-        api projectByName("exposed.commons")
-    }
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test"

publishing/exposed/maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "Exposed realisation for PostsSystem Core Publishing subsystem"
-            name = "PostsSystem Core Publishing Exposed realization"
-            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

publishing/exposed/publish.gradle

@@ -1,55 +1,69 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-apply from: "maven.publish.gradle"
+task javadocsJar(type: Jar) {
-
+    classifier = 'javadoc'
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}"
-        vcsUrl = "https://github.com/PostsSystem/PostsSystemCore"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
 }
+task sourceJar (type : Jar) {
+    classifier = 'sources'
 }
 
-bintrayUpload.doFirst {
+afterEvaluate {
-    publications = publishing.publications.collect {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
-            null
+            artifactId = "${project.name}"
+            artifact sourceJar
         } else {
-            it.name
+            artifactId = "${project.name}-$name"
+        }
     }
-    } - null
 }
 
-bintrayUpload.dependsOn publishToMavenLocal
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "Exposed realisation for PostsSystem Core Publishing subsystem"
+            name = "PostsSystem Core Publishing Exposed realization"
+            url = "https://git.insanusmokrassar.com/PostsSystem/Core/"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+                url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

publishing/exposed/publish_config.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Publishing Exposed realization","description":"Exposed realisation for PostsSystem Core Publishing subsystem","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}
+{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Publishing Exposed realization","description":"Exposed realisation for PostsSystem Core Publishing subsystem","url":"https://git.insanusmokrassar.com/PostsSystem/Core/","vcsUrl":"https://git.insanusmokrassar.com/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

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 "dev.inmo:micro_utils.ktor.client:$microutils_version"
-                    api "com.insanusmokrassar:postssystem.core.ktor.common:$core_version"
+
-                    api "com.insanusmokrassar:postssystem.ktor.client:$core_version"
+                api project(":postssystem.publishing.ktor.common")
-                } else {
-                    api projectByName("publishing.ktor.common")
-                    api projectByName("ktor.client")
-                }
             }
         }
         commonTest {

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

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
 

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 "dev.inmo:micro_utils.ktor.common:$microutils_version"
-                    api "com.insanusmokrassar:postssystem.ktor.common:$core_version"
+
-                    api "com.insanusmokrassar:postssystem.publishing.api:$core_version"
+                api project(":postssystem.publishing.api")
-                } else {
-                    api projectByName("ktor.common")
-                    api projectByName("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')

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 postsIdSerializer = SetSerializer(PostId.serializer())
-val triggerControlKeysSerializer = setIdsSerializer
+val triggerControlKeysSerializer = SetSerializer(TriggerControlKey.serializer())

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 "dev.inmo:micro_utils.ktor.server:$microutils_version"
-    api projectByName("ktor.server")
+
+    api project(":postssystem.publishing.ktor.common")
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test"

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