Flatten packages

Remove modules prefix

Dockerfile

@@ -21,7 +21,7 @@ RUN chown -R $APPLICATION_USER /app
 USER $APPLICATION_USER
 
 COPY --from=jdkbuilder /myjdk /myjdk
-COPY simplenotes-app/build/libs/simplenotes-app-with-dependencies*.jar /app/simplenotes.jar
+COPY app/build/libs/app-with-dependencies*.jar /app/simplenotes.jar
 WORKDIR /app
 
 CMD [ \

app/build.gradle.kts

@@ -10,10 +10,10 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":simplenotes-domain"))
+    implementation(project(":domain"))
-    implementation(project(":simplenotes-types"))
+    implementation(project(":types"))
-    implementation(project(":simplenotes-config"))
+    implementation(project(":config"))
-    implementation(project(":simplenotes-views"))
+    implementation(project(":views"))
 
     implementation(Libs.arrowCoreData)
     implementation(Libs.konform)

app/resources/logback.xml

@@ -14,5 +14,5 @@
     <logger name="com.zaxxer.hikari" level="INFO"/>
     <logger name="org.flywaydb.core" level="INFO"/>
     <logger name="io.micronaut" level="INFO"/>
-    <logger name="io.micronaut.context.lifecycle" level="DEBUG"/>
+    <logger name="io.micronaut.context.lifecycle" level="INFO"/>
 </configuration>

app/test/Index.kt

@@ -0,0 +1 @@
+package be.simplenotes.app

buildSrc/src/main/kotlin/be/simplenotes/CssTask.kt

@@ -15,15 +15,15 @@ open class CssTask : DefaultTask() {
 
     private val viewsProject = project
         .parent
-        ?.project(":simplenotes-views")
+        ?.project(":views")
-        ?: error("Missing :simplenotes-views")
+        ?: error("Missing :views")
 
     @get:InputDirectory
     val templatesDir = viewsProject.extensions
         .getByType<SourceSetContainer>()
         .asMap.getOrElse("main") { error("main sources not found") }
         .allSource.srcDirs
-        .find { it.endsWith("kotlin") }
+        .find { it.endsWith("src") }
         ?: error("kotlin sources not found")
 
     private val yarnRoot = File(project.rootDir, "css")

buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts

@@ -24,3 +24,6 @@ java {
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
+
+sourceSets["main"].resources.srcDirs("resources")
+sourceSets["test"].resources.srcDirs("testresources")

buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts

@@ -10,5 +10,5 @@ tasks.withType<Test> {
 
 sourceSets {
     val test by getting
-    test.resources.srcDir("${rootProject.projectDir}/simplenotes-test-resources/src/test/resources")
+    test.resources.srcDir("${rootProject.projectDir}/testresources/src/test/resources")
 }

buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts

@@ -23,3 +23,6 @@ tasks.withType<KotlinCompile> {
         )
     }
 }
+
+kotlin.sourceSets["main"].kotlin.srcDirs("src")
+kotlin.sourceSets["test"].kotlin.srcDirs("test")

domain/build.gradle.kts

@@ -7,10 +7,10 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":simplenotes-config"))
+    implementation(project(":config"))
-    implementation(project(":simplenotes-types"))
+    implementation(project(":types"))
-    implementation(project(":simplenotes-persistance"))
+    implementation(project(":persistance"))
-    implementation(project(":simplenotes-search"))
+    implementation(project(":search"))
 
     implementation(Libs.micronaut)
     kapt(Libs.micronautProcessor)

domain/src/Index.kt

@@ -0,0 +1 @@
+package be.simplenotes.domain

domain/test/Index.kt

@@ -0,0 +1 @@
+package be.simplenotes.domain

persistance/build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":simplenotes-types"))
+    implementation(project(":types"))
-    implementation(project(":simplenotes-config"))
+    implementation(project(":config"))
 
     implementation(Libs.mariadbClient)
     implementation(Libs.h2)
@@ -29,9 +29,9 @@ dependencies {
     testImplementation(Libs.logbackClassic)
     testImplementation(Libs.mariaTestContainer)
 
-    testFixturesImplementation(project(":simplenotes-types"))
+    testFixturesImplementation(project(":types"))
-    testFixturesImplementation(project(":simplenotes-config"))
+    testFixturesImplementation(project(":config"))
-    testFixturesImplementation(project(":simplenotes-persistance"))
+    testFixturesImplementation(project(":persistance"))
 
     testFixturesImplementation(Libs.micronaut)
     kaptTestFixtures(Libs.micronautProcessor)
@@ -48,3 +48,5 @@ dependencies {
     testFixturesImplementation(Libs.ktormCore)
     testFixturesImplementation(Libs.hikariCP)
 }
+
+kotlin.sourceSets["testFixtures"].kotlin.srcDirs("testfixtures")