Create modules/subprojects to split code into, and move the example a…

…nd benchmark code into the module "integrated"

IntelliJ IDEA Code Analysis shows there are 5 errors.

buildSrc/src/main/kotlin/conventions.gradle.kts

@@ -1,12 +1,8 @@
-import com.huanshankeji.team.`Shreck Ye`
-import com.huanshankeji.team.pomForTeamDefaultOpenSource
 import com.huanshankeji.team.repositoriesAddTeamGithubPackagesMavenRegistry
-import org.gradle.kotlin.dsl.repositories
 
 plugins {
     id("com.huanshankeji.team.with-group")
-    id("com.huanshankeji.kotlin-jvm-library-sonatype-ossrh-publish-conventions")
-    id("com.huanshankeji.team.default-github-packages-maven-publish")
+    kotlin("jvm")
 }
 
 repositories {
@@ -18,9 +14,3 @@ repositoriesAddTeamGithubPackagesMavenRegistry("kotlin-common")
 kotlin.jvmToolchain(8)
 
 version = projectVersion
-
-publishing.publications.getByName<MavenPublication>("maven") {
-    pomForTeamDefaultOpenSource(project, "Exposed Vert.x SQL Client", "Exposed on top of Vert.x Reactive SQL Client") {
-        `Shreck Ye`()
-    }
-}

buildSrc/src/main/kotlin/lib-conventions.gradle.kts

@@ -0,0 +1,15 @@
+import com.huanshankeji.team.`Shreck Ye`
+import com.huanshankeji.team.pomForTeamDefaultOpenSource
+
+plugins {
+    id("conventions")
+    id("com.huanshankeji.kotlin-jvm-library-sonatype-ossrh-publish-conventions")
+    id("com.huanshankeji.team.default-github-packages-maven-publish")
+    id("com.huanshankeji.team.dokka.github-dokka-convention")
+}
+
+publishing.publications.getByName<MavenPublication>("maven") {
+    pomForTeamDefaultOpenSource(project, "Exposed Vert.x SQL Client", "Exposed on top of Vert.x Reactive SQL Client") {
+        `Shreck Ye`()
+    }
+}

lib/build.gradle.kts → core/build.gradle.kts

@@ -1,15 +1,13 @@
 plugins {
-    conventions
-    id("com.huanshankeji.benchmark.kotlinx-benchmark-jvm-conventions")
-    id("com.huanshankeji.team.dokka.github-dokka-convention")
+    `lib-conventions`
 }
 
 dependencies {
     api(commonDependencies.exposed.core()) // TODO: use `implementation` when possible
     // TODO: remove the Exposed JDBC dependency and the PostgresSQL dependency when there is no need to to generate SQLs with an Exposed transaction
     runtimeOnly(commonDependencies.exposed.module("jdbc"))
     api(commonDependencies.kotlinCommon.exposed())
-    implementation("com.huanshankeji:exposed-adt-mapping:${DependencyVersions.exposedAdtMapping}")
+    implementation("com.huanshankeji:exposed-adt-mapping:${DependencyVersions.exposedAdtMapping}") // TODO remove when code is moved out
 
     with(commonDependencies.vertx) {
         implementation(platformStackDepchain())
@@ -25,20 +23,9 @@ dependencies {
     implementation(commonDependencies.kotlinCommon.net())
 }
 
-
+// TODO remove when code is moved out
 // for PostgreSQL
 dependencies {
     runtimeOnly(commonDependencies.postgreSql())
     implementation(commonDependencies.vertx.moduleWithoutVersion("pg-client"))
 }
-
-afterEvaluate {
-// for the benchmarks
-    dependencies {
-        with(commonDependencies.testContainers) {
-            "benchmarksImplementation"(platformBom())
-            "benchmarksImplementation"(postgreSql)
-        }
-        "benchmarksImplementation"(commonDependencies.slf4j.simple())
-    }
-}

integrated/README.md

@@ -0,0 +1,3 @@
+# The integrated module
+
+This module includes tests, benchmarks, and examples.

integrated/build.gradle.kts

@@ -0,0 +1,28 @@
+import com.huanshankeji.cpnProject
+
+plugins {
+    conventions
+    id("com.huanshankeji.benchmark.kotlinx-benchmark-jvm-conventions")
+}
+
+dependencies {
+    with(commonDependencies.vertx) { implementation(platformStackDepchain()) } // needed
+
+    implementation(cpnProject(project, ":core"))
+
+    testImplementation("com.huanshankeji:exposed-adt-mapping:${DependencyVersions.exposedAdtMapping}")
+    testImplementation(cpnProject(project, ":sql-dsl-with-mapper"))
+}
+
+afterEvaluate {
+// for the benchmarks
+    dependencies {
+        "benchmarksImplementation"(cpnProject(project, ":postgresql"))
+
+        with(commonDependencies.testContainers) {
+            "benchmarksImplementation"(platformBom())
+            "benchmarksImplementation"(postgreSql)
+        }
+        "benchmarksImplementation"(commonDependencies.slf4j.simple())
+    }
+}

postgresql/build.gradle.kts

@@ -0,0 +1,13 @@
+import com.huanshankeji.cpnProject
+
+plugins {
+    `lib-conventions`
+}
+
+dependencies {
+    with(commonDependencies.vertx) { implementation(platformStackDepchain()) } // needed
+    implementation(cpnProject(project, ":core"))
+
+    runtimeOnly(commonDependencies.postgreSql())
+    implementation(commonDependencies.vertx.moduleWithoutVersion("pg-client"))
+}

settings.gradle.kts

@@ -1,6 +1,16 @@
 rootProject.name = "exposed-vertx-sql-client"
-include("lib")
-project(":lib").name = rootProject.name + "-postgresql"
+
+include("core")
+include("sql-dsl-with-mapper")
+include("postgresql")
+include("integrated")
+
+fun ProjectDescriptor.setProjectConcatenatedNames(prefix: String) {
+    name = prefix + name
+    for (child in children)
+        child.setProjectConcatenatedNames("$name-")
+}
+rootProject.setProjectConcatenatedNames("")
 
 // for Dokka
 @Suppress("UnstableApiUsage")

sql-dsl-with-mapper/build.gradle.kts

@@ -0,0 +1,10 @@
+import com.huanshankeji.cpnProject
+
+plugins {
+    `lib-conventions`
+}
+
+dependencies {
+    with(commonDependencies.vertx) { implementation(platformStackDepchain()) } // needed
+    implementation(cpnProject(project, ":core"))
+}