temporal push for keeping history

core/api/build.gradle

@@ -0,0 +1,76 @@
+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" }
+}
+
+project.kotlin {
+    jvm()
+    js()
+
+    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.utils.repos:$core_version"
+                } else {
+                    api project(":utils:repos")
+                }
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                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')
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

core/exposed/build.gradle

@@ -34,11 +34,11 @@ 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 "com.insanusmokrassar:postssystem.core:$core_version"
+        api "com.insanusmokrassar:postssystem.core.api:$core_version"
         api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
     } else {
-        api project(":postssystem.core")
+        api project(":core:api")
-        api project(":postssystem.exposed.commons")
+        api project(":exposed:commons")
     }
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"

core/ktor/client/build.gradle

@@ -0,0 +1,78 @@
+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()
+
+    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.core.ktor.common:$core_version"
+                    api "com.insanusmokrassar:postssystem.ktor.client:$core_version"
+                } else {
+                    api project(":core:ktor:common")
+                    api project(":ktor:client")
+                }
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                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')
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

core/ktor/client/gradle.properties

@@ -0,0 +1 @@
+

core/ktor/client/publish_config.json

@@ -0,0 +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"}

core/ktor/client/settings.gradle

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,32 @@
+package com.insanusmokrassar.postssystem.core.ktor.client.content
+
+//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.getContentByIdRoute
+//import com.insanusmokrassar.postssystem.core.ktor.getContentsIdsRoute
+//import com.insanusmokrassar.postssystem.utils.repos.pagination.Pagination
+//import com.insanusmokrassar.postssystem.utils.repos.pagination.PaginationResult
+//import io.ktor.client.HttpClient
+//import io.ktor.client.request.get
+//import io.ktor.client.statement.HttpResponse
+//import kotlinx.io.InputStream
+//
+//class ReadContentRepoKtorClient(
+//    private val client: HttpClient,
+//    private val baseUrl: String
+//) : ReadContentRepo {
+//    override suspend fun getContentsIds(): Set<ContentId> = client.get<HttpResponse>(
+//        "$baseUrl/$getContentsIdsRoute"
+//    ).content.let {
+//        TODO()
+//    }
+//
+//    override suspend fun getContentById(id: ContentId): RegisteredContent? {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getContentByPagination(pagination: Pagination): PaginationResult<out RegisteredContent> {
+//        TODO("Not yet implemented")
+//    }
+//}

core/ktor/common/build.gradle

@@ -0,0 +1,78 @@
+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()
+
+    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"
+                    api "com.insanusmokrassar:postssystem.core.api:$core_version"
+                } else {
+                    api project(":ktor:common")
+                    api project(":core:api")
+                }
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                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')
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

core/ktor/common/gradle.properties

@@ -0,0 +1 @@
+

core/ktor/common/publish_config.json

@@ -0,0 +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"}

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

@@ -0,0 +1,5 @@
+package com.insanusmokrassar.postssystem.core.ktor
+
+const val getContentsIdsRoute = "getContentsIds"
+const val getContentByIdRoute = "getContentById"
+const val getContentByPaginationRoute = "getContentByPagination"

exposed/commons/build.gradle

@@ -31,17 +31,15 @@ repositories {
 }
 
 dependencies {
-    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    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.core:$core_version"
+        api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
     } else {
-        api project(":postssystem.core")
+        api project(":utils:repos")
     }
 
-    testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
 }

gradle.properties

@@ -1,8 +1,10 @@
 kotlin.code.style=official
 kotlin_version=1.3.72
-kotlin_coroutines_version=1.3.7
+kotlin_coroutines_version=1.3.8
 kotlin_serialisation_runtime_version=0.20.0
 
+ktor_version=1.3.2
+
 klockVersion=1.11.12
 uuidVersion=0.1.0
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,4 @@
-#Wed JAN 29 22:07:00 OMST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

ktor/client/build.gradle

@@ -0,0 +1,82 @@
+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()
+
+    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 project(":ktor:common")
+                }
+
+                api "io.ktor:ktor-client-core:$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"
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsMain {
+            dependencies {
+                implementation kotlin('stdlib-js')
+
+                api "io.ktor:ktor-client-js:$ktor_version"
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-js')
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

ktor/common/build.gradle

@@ -37,17 +37,8 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlin_serialisation_runtime_version"
-
+                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor-common:$kotlin_serialisation_runtime_version"
-                api "com.soywiz.korlibs.klock:klock:$klockVersion"
-                api "com.benasher44:uuid:$uuidVersion"
-
-                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 project(":postssystem.utils.repos")
-                }
             }
         }
         commonTest {
@@ -59,8 +50,8 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_runtime_version"
             }
         }
         jvmTest {
@@ -71,8 +62,8 @@ kotlin {
         jsMain {
             dependencies {
                 implementation kotlin('stdlib-js')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$kotlin_coroutines_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-cbor-js:$kotlin_serialisation_runtime_version"
             }
         }
         jsTest {

ktor/common/publish_config.kpsb

@@ -0,0 +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 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/StandardSerializer.kt

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

markups/build.gradle

@@ -41,9 +41,9 @@ kotlin {
                 api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlin_serialisation_runtime_version"
 
                 if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
-                    api "com.insanusmokrassar:postssystem.core:$core_version"
+                    api "com.insanusmokrassar:postssystem.core.api:$core_version"
                 } else {
-                    api project(":postssystem.core")
+                    api project(":core:api")
                 }
 
                 api "com.soywiz.korlibs.klock:klock:$klockVersion"

markups/html/build.gradle

@@ -13,8 +13,8 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization"
 }
 
 project.version = "$core_version"
@@ -43,7 +43,7 @@ kotlin {
                 if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
                     api "com.insanusmokrassar:postssystem.markups.core:$core_version"
                 } else {
-                    api project(":postssystem.markups.core")
+                    api project(":markups")
                 }
             }
         }

markups/html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupPlugin.kt

@@ -0,0 +1,10 @@
+package com.insanusmokrassar.postssystem.markups.html
+
+import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
+import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
+import kotlinx.html.FlowContent
+
+//abstract class HtmlMarkupPlugin(
+//    postsRepo: ReadPostsRepo,
+//    postsContentRepo: ReadContentRepo
+//) : AbstractMarkupPlugin<FlowContent>(postsRepo, postsContentRepo)

markups/html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupPlugin.kt

@@ -0,0 +1,10 @@
+package com.insanusmokrassar.postssystem.markups.html
+
+import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
+import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
+import kotlinx.html.FlowContent
+
+//abstract class HtmlMarkupPlugin(
+//    postsRepo: ReadPostsRepo,
+//    postsContentRepo: ReadContentRepo
+//) : AbstractMarkupPlugin<FlowContent>(postsRepo, postsContentRepo)

markups/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupPlugin.kt

@@ -0,0 +1,24 @@
+package com.insanusmokrassar.postssystem.markups.core
+
+import com.insanusmokrassar.postssystem.core.content.RegisteredContent
+import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
+import com.insanusmokrassar.postssystem.core.post.PostId
+import com.insanusmokrassar.postssystem.core.post.RegisteredPost
+import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
+
+//abstract class AbstractMarkupPlugin<MarkupTarget>(
+//    @Suppress("MemberVisibilityCanBePrivate")
+//    protected val postsRepo: ReadPostsRepo,
+//    @Suppress("MemberVisibilityCanBePrivate")
+//    protected val postsContentRepo: ReadContentRepo
+//) : MarkupPlugin<MarkupTarget> {
+//    override suspend fun drawMarkupBuilder(on: MarkupTarget, postId: PostId) {
+//        val post = postsRepo.getPostById(postId) ?: return
+//        val contents = post.content.mapNotNull {
+//            postsContentRepo.getContentById(it)
+//        }
+//        drawMarkupBuilder(on, post, contents)
+//    }
+//
+//    abstract suspend fun drawMarkupBuilder(target: MarkupTarget, forPost: RegisteredPost, content: List<RegisteredContent>)
+//}

postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupPlugin.kt

@@ -1,24 +0,0 @@
-package com.insanusmokrassar.postssystem.markups.core
-
-import com.insanusmokrassar.postssystem.core.content.RegisteredContent
-import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
-import com.insanusmokrassar.postssystem.core.post.PostId
-import com.insanusmokrassar.postssystem.core.post.RegisteredPost
-import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
-
-abstract class AbstractMarkupPlugin<MarkupTarget>(
-    @Suppress("MemberVisibilityCanBePrivate")
-    protected val postsRepo: ReadPostsRepo,
-    @Suppress("MemberVisibilityCanBePrivate")
-    protected val postsContentRepo: ReadContentRepo
-) : MarkupPlugin<MarkupTarget> {
-    override suspend fun drawMarkupBuilder(on: MarkupTarget, postId: PostId) {
-        val post = postsRepo.getPostById(postId) ?: return
-        val contents = post.content.mapNotNull {
-            postsContentRepo.getContentById(it)
-        }
-        drawMarkupBuilder(on, post, contents)
-    }
-
-    abstract suspend fun drawMarkupBuilder(target: MarkupTarget, forPost: RegisteredPost, content: List<RegisteredContent>)
-}

postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupPlugin.kt

@@ -1,11 +0,0 @@
-package com.insanusmokrassar.postssystem.markups.html
-
-import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
-import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
-import com.insanusmokrassar.postssystem.markups.core.AbstractMarkupPlugin
-import kotlinx.html.FlowContent
-
-abstract class HtmlMarkupPlugin(
-    postsRepo: ReadPostsRepo,
-    postsContentRepo: ReadContentRepo
-) : AbstractMarkupPlugin<FlowContent>(postsRepo, postsContentRepo)

postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupPlugin.kt

@@ -1,11 +0,0 @@
-package com.insanusmokrassar.postssystem.markups.html
-
-import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo
-import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo
-import com.insanusmokrassar.postssystem.markups.core.AbstractMarkupPlugin
-import kotlinx.html.FlowContent
-
-abstract class HtmlMarkupPlugin(
-    postsRepo: ReadPostsRepo,
-    postsContentRepo: ReadContentRepo
-) : AbstractMarkupPlugin<FlowContent>(postsRepo, postsContentRepo)

publishing/api/build.gradle

@@ -39,9 +39,9 @@ kotlin {
                 implementation kotlin('stdlib')
 
                 if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
-                    api "com.insanusmokrassar:postssystem.core:$core_version"
+                    api "com.insanusmokrassar:postssystem.core.api:$core_version"
                 } else {
-                    api project(":postssystem.core")
+                    api project(":core:api")
                 }
             }
         }

publishing/exposed/build.gradle

@@ -37,8 +37,8 @@ dependencies {
         api "com.insanusmokrassar:postssystem.core.publishing:$core_version"
         api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
     } else {
-        api project(":postssystem.core.publishing")
+        api project(":publishing:api")
-        api project(":postssystem.exposed.commons")
+        api project(":exposed:commons")
     }
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"

settings.gradle

@@ -1,14 +1,26 @@
 rootProject.name='postssystem'
 
-include ':postssystem.utils.repos'
+String[] includes = [
-include ':postssystem.exposed.commons'
+    ':utils:repos',
-include ':postssystem.utils.repos.exposed'
+    ':utils:repos:exposed',
 
-include ':postssystem.core'
+    ':exposed:commons',
-include ':postssystem.core.exposed'
 
-include ':postssystem.core.publishing'
+    ':ktor:common',
-include ':postssystem.core.publishing.exposed'
+    ':ktor:client',
 
-include ':postssystem.markups.core'
+    ':core:api',
-include ':postssystem.markups.html'
+    ':core:exposed',
+    ':core:ktor:common',
+    ':core:ktor:client',
+
+    ':publishing:api',
+    ':publishing:exposed',
+
+    ':markups',
+    ':markups:html'
+]
+
+includes.each {
+    include it
+}

utils/repos/exposed/build.gradle

@@ -13,7 +13,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization"
 }
 
 project.version = "$core_version"
@@ -31,14 +31,14 @@ repositories {
 }
 
 dependencies {
-    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
         api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
         api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
     } else {
-        api project(":postssystem.utils.repos")
+        api project(":utils:repos")
-        api project(":postssystem.exposed.commons")
+        api project(":exposed:commons")
     }
 
     testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"

utils/repos/exposed/maven.publish.gradle

@@ -0,0 +1,53 @@
+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"
+                    }
+                
+            }
+        }
+    }
+}

utils/repos/exposed/publish_config.kpsb

@@ -0,0 +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 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"}