diff --git a/Dockerfile b/Dockerfile index 535e812..fa516cd 100644 --- a/Dockerfile +++ b/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 [ \ diff --git a/simplenotes-app/build.gradle.kts b/app/build.gradle.kts similarity index 79% rename from simplenotes-app/build.gradle.kts rename to app/build.gradle.kts index 33f0fa1..9ad66a9 100644 --- a/simplenotes-app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,10 +10,10 @@ plugins { } dependencies { - implementation(project(":simplenotes-domain")) - implementation(project(":simplenotes-types")) - implementation(project(":simplenotes-config")) - implementation(project(":simplenotes-views")) + implementation(project(":domain")) + implementation(project(":types")) + implementation(project(":config")) + implementation(project(":views")) implementation(Libs.arrowCoreData) implementation(Libs.konform) diff --git a/simplenotes-app/src/main/resources/logback.xml b/app/resources/logback.xml similarity index 91% rename from simplenotes-app/src/main/resources/logback.xml rename to app/resources/logback.xml index 13f8fa8..9ede072 100644 --- a/simplenotes-app/src/main/resources/logback.xml +++ b/app/resources/logback.xml @@ -14,5 +14,5 @@ - + diff --git a/simplenotes-app/src/main/resources/static/android-chrome-192x192.png b/app/resources/static/android-chrome-192x192.png similarity index 100% rename from simplenotes-app/src/main/resources/static/android-chrome-192x192.png rename to app/resources/static/android-chrome-192x192.png diff --git a/simplenotes-app/src/main/resources/static/android-chrome-512x512.png b/app/resources/static/android-chrome-512x512.png similarity index 100% rename from simplenotes-app/src/main/resources/static/android-chrome-512x512.png rename to app/resources/static/android-chrome-512x512.png diff --git a/simplenotes-app/src/main/resources/static/apple-touch-icon.png b/app/resources/static/apple-touch-icon.png similarity index 100% rename from simplenotes-app/src/main/resources/static/apple-touch-icon.png rename to app/resources/static/apple-touch-icon.png diff --git a/simplenotes-app/src/main/resources/static/browserconfig.xml b/app/resources/static/browserconfig.xml similarity index 100% rename from simplenotes-app/src/main/resources/static/browserconfig.xml rename to app/resources/static/browserconfig.xml diff --git a/simplenotes-app/src/main/resources/static/favicon-16x16.png b/app/resources/static/favicon-16x16.png similarity index 100% rename from simplenotes-app/src/main/resources/static/favicon-16x16.png rename to app/resources/static/favicon-16x16.png diff --git a/simplenotes-app/src/main/resources/static/favicon-32x32.png b/app/resources/static/favicon-32x32.png similarity index 100% rename from simplenotes-app/src/main/resources/static/favicon-32x32.png rename to app/resources/static/favicon-32x32.png diff --git a/simplenotes-app/src/main/resources/static/favicon.ico b/app/resources/static/favicon.ico similarity index 100% rename from simplenotes-app/src/main/resources/static/favicon.ico rename to app/resources/static/favicon.ico diff --git a/simplenotes-app/src/main/resources/static/highlight.10.1.2.js b/app/resources/static/highlight.10.1.2.js similarity index 100% rename from simplenotes-app/src/main/resources/static/highlight.10.1.2.js rename to app/resources/static/highlight.10.1.2.js diff --git a/simplenotes-app/src/main/resources/static/init-highlight.0.0.1.js b/app/resources/static/init-highlight.0.0.1.js similarity index 100% rename from simplenotes-app/src/main/resources/static/init-highlight.0.0.1.js rename to app/resources/static/init-highlight.0.0.1.js diff --git a/simplenotes-app/src/main/resources/static/mstile-144x144.png b/app/resources/static/mstile-144x144.png similarity index 100% rename from simplenotes-app/src/main/resources/static/mstile-144x144.png rename to app/resources/static/mstile-144x144.png diff --git a/simplenotes-app/src/main/resources/static/mstile-150x150.png b/app/resources/static/mstile-150x150.png similarity index 100% rename from simplenotes-app/src/main/resources/static/mstile-150x150.png rename to app/resources/static/mstile-150x150.png diff --git a/simplenotes-app/src/main/resources/static/mstile-310x150.png b/app/resources/static/mstile-310x150.png similarity index 100% rename from simplenotes-app/src/main/resources/static/mstile-310x150.png rename to app/resources/static/mstile-310x150.png diff --git a/simplenotes-app/src/main/resources/static/mstile-310x310.png b/app/resources/static/mstile-310x310.png similarity index 100% rename from simplenotes-app/src/main/resources/static/mstile-310x310.png rename to app/resources/static/mstile-310x310.png diff --git a/simplenotes-app/src/main/resources/static/mstile-70x70.png b/app/resources/static/mstile-70x70.png similarity index 100% rename from simplenotes-app/src/main/resources/static/mstile-70x70.png rename to app/resources/static/mstile-70x70.png diff --git a/simplenotes-app/src/main/resources/static/recursive-0.0.1.woff2 b/app/resources/static/recursive-0.0.1.woff2 similarity index 100% rename from simplenotes-app/src/main/resources/static/recursive-0.0.1.woff2 rename to app/resources/static/recursive-0.0.1.woff2 diff --git a/simplenotes-app/src/main/resources/static/robots.txt b/app/resources/static/robots.txt similarity index 100% rename from simplenotes-app/src/main/resources/static/robots.txt rename to app/resources/static/robots.txt diff --git a/simplenotes-app/src/main/resources/static/safari-pinned-tab.svg b/app/resources/static/safari-pinned-tab.svg similarity index 100% rename from simplenotes-app/src/main/resources/static/safari-pinned-tab.svg rename to app/resources/static/safari-pinned-tab.svg diff --git a/simplenotes-app/src/main/resources/static/site.webmanifest b/app/resources/static/site.webmanifest similarity index 100% rename from simplenotes-app/src/main/resources/static/site.webmanifest rename to app/resources/static/site.webmanifest diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/Server.kt b/app/src/Server.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/Server.kt rename to app/src/Server.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/SimpleNotes.kt b/app/src/SimpleNotes.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/SimpleNotes.kt rename to app/src/SimpleNotes.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/api/ApiNoteController.kt b/app/src/api/ApiNoteController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/api/ApiNoteController.kt rename to app/src/api/ApiNoteController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/api/ApiUserController.kt b/app/src/api/ApiUserController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/api/ApiUserController.kt rename to app/src/api/ApiUserController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/BaseController.kt b/app/src/controllers/BaseController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/BaseController.kt rename to app/src/controllers/BaseController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/HealthCheckController.kt b/app/src/controllers/HealthCheckController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/HealthCheckController.kt rename to app/src/controllers/HealthCheckController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/NoteController.kt b/app/src/controllers/NoteController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/NoteController.kt rename to app/src/controllers/NoteController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/SettingsController.kt b/app/src/controllers/SettingsController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/SettingsController.kt rename to app/src/controllers/SettingsController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/UserController.kt b/app/src/controllers/UserController.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/UserController.kt rename to app/src/controllers/UserController.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/extensions/Http4kExtensions.kt b/app/src/extensions/Http4kExtensions.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/extensions/Http4kExtensions.kt rename to app/src/extensions/Http4kExtensions.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/ErrorFilter.kt b/app/src/filters/ErrorFilter.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/ErrorFilter.kt rename to app/src/filters/ErrorFilter.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/ImmutableFilter.kt b/app/src/filters/ImmutableFilter.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/ImmutableFilter.kt rename to app/src/filters/ImmutableFilter.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/SecurityFilter.kt b/app/src/filters/SecurityFilter.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/SecurityFilter.kt rename to app/src/filters/SecurityFilter.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/auth/AuthFilter.kt b/app/src/filters/auth/AuthFilter.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/auth/AuthFilter.kt rename to app/src/filters/auth/AuthFilter.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/auth/OptionalAuthFilter.kt b/app/src/filters/auth/OptionalAuthFilter.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/auth/OptionalAuthFilter.kt rename to app/src/filters/auth/OptionalAuthFilter.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/auth/RequiredAuthFilter.kt b/app/src/filters/auth/RequiredAuthFilter.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/auth/RequiredAuthFilter.kt rename to app/src/filters/auth/RequiredAuthFilter.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/jetty/Jetty.kt b/app/src/jetty/Jetty.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/jetty/Jetty.kt rename to app/src/jetty/Jetty.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/AuthModule.kt b/app/src/modules/AuthModule.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/AuthModule.kt rename to app/src/modules/AuthModule.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/JsonModule.kt b/app/src/modules/JsonModule.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/JsonModule.kt rename to app/src/modules/JsonModule.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ServerModule.kt b/app/src/modules/ServerModule.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ServerModule.kt rename to app/src/modules/ServerModule.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/ApiRoutes.kt b/app/src/routes/ApiRoutes.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/ApiRoutes.kt rename to app/src/routes/ApiRoutes.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/BasicRoutes.kt b/app/src/routes/BasicRoutes.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/BasicRoutes.kt rename to app/src/routes/BasicRoutes.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/NoteRoutes.kt b/app/src/routes/NoteRoutes.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/NoteRoutes.kt rename to app/src/routes/NoteRoutes.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/RouteUtils.kt b/app/src/routes/RouteUtils.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/RouteUtils.kt rename to app/src/routes/RouteUtils.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/Router.kt b/app/src/routes/Router.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/Router.kt rename to app/src/routes/Router.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/SettingsRoutes.kt b/app/src/routes/SettingsRoutes.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/SettingsRoutes.kt rename to app/src/routes/SettingsRoutes.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/serialization/LocalDateTimeSerializer.kt b/app/src/serialization/LocalDateTimeSerializer.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/serialization/LocalDateTimeSerializer.kt rename to app/src/serialization/LocalDateTimeSerializer.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/serialization/UuidSerializer.kt b/app/src/serialization/UuidSerializer.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/serialization/UuidSerializer.kt rename to app/src/serialization/UuidSerializer.kt diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/utils/StaticFilesResolver.kt b/app/src/utils/StaticFilesResolver.kt similarity index 100% rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/utils/StaticFilesResolver.kt rename to app/src/utils/StaticFilesResolver.kt diff --git a/app/test/Index.kt b/app/test/Index.kt new file mode 100644 index 0000000..59900e4 --- /dev/null +++ b/app/test/Index.kt @@ -0,0 +1 @@ +package be.simplenotes.app diff --git a/simplenotes-app/src/test/kotlin/be/simplenotes/app/filters/RequiredAuthFilterTest.kt b/app/test/filters/RequiredAuthFilterTest.kt similarity index 100% rename from simplenotes-app/src/test/kotlin/be/simplenotes/app/filters/RequiredAuthFilterTest.kt rename to app/test/filters/RequiredAuthFilterTest.kt diff --git a/buildSrc/src/main/kotlin/be/simplenotes/CssTask.kt b/buildSrc/src/main/kotlin/be/simplenotes/CssTask.kt index 870707d..f8a800f 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/CssTask.kt +++ b/buildSrc/src/main/kotlin/be/simplenotes/CssTask.kt @@ -15,15 +15,15 @@ open class CssTask : DefaultTask() { private val viewsProject = project .parent - ?.project(":simplenotes-views") - ?: error("Missing :simplenotes-views") + ?.project(":views") + ?: error("Missing :views") @get:InputDirectory val templatesDir = viewsProject.extensions .getByType() .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") diff --git a/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts index 5d4f491..b77e8c5 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts @@ -24,3 +24,6 @@ java { tasks.withType { options.encoding = "UTF-8" } + +sourceSets["main"].resources.srcDirs("resources") +sourceSets["test"].resources.srcDirs("testresources") diff --git a/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts index b8bd482..ab7c97a 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts @@ -10,5 +10,5 @@ tasks.withType { 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") } diff --git a/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts index 410cd9e..4c2664b 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts @@ -23,3 +23,6 @@ tasks.withType { ) } } + +kotlin.sourceSets["main"].kotlin.srcDirs("src") +kotlin.sourceSets["test"].kotlin.srcDirs("test") diff --git a/simplenotes-config/build.gradle.kts b/config/build.gradle.kts similarity index 100% rename from simplenotes-config/build.gradle.kts rename to config/build.gradle.kts diff --git a/simplenotes-config/src/main/resources/application.yaml b/config/resources/application.yaml similarity index 100% rename from simplenotes-config/src/main/resources/application.yaml rename to config/resources/application.yaml diff --git a/simplenotes-config/src/main/kotlin/be/simplenotes/config/Config.kt b/config/src/Config.kt similarity index 100% rename from simplenotes-config/src/main/kotlin/be/simplenotes/config/Config.kt rename to config/src/Config.kt diff --git a/simplenotes-domain/build.gradle.kts b/domain/build.gradle.kts similarity index 77% rename from simplenotes-domain/build.gradle.kts rename to domain/build.gradle.kts index 89b2cc5..771981c 100644 --- a/simplenotes-domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -7,10 +7,10 @@ plugins { } dependencies { - implementation(project(":simplenotes-config")) - implementation(project(":simplenotes-types")) - implementation(project(":simplenotes-persistance")) - implementation(project(":simplenotes-search")) + implementation(project(":config")) + implementation(project(":types")) + implementation(project(":persistance")) + implementation(project(":search")) implementation(Libs.micronaut) kapt(Libs.micronautProcessor) diff --git a/domain/src/Index.kt b/domain/src/Index.kt new file mode 100644 index 0000000..c2a7303 --- /dev/null +++ b/domain/src/Index.kt @@ -0,0 +1 @@ +package be.simplenotes.domain diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/HtmlSanitizer.kt b/domain/src/security/HtmlSanitizer.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/HtmlSanitizer.kt rename to domain/src/security/HtmlSanitizer.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/JwtPayloadExtractor.kt b/domain/src/security/JwtPayloadExtractor.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/JwtPayloadExtractor.kt rename to domain/src/security/JwtPayloadExtractor.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/PasswordHash.kt b/domain/src/security/PasswordHash.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/PasswordHash.kt rename to domain/src/security/PasswordHash.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/SimpleJwt.kt b/domain/src/security/SimpleJwt.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/SimpleJwt.kt rename to domain/src/security/SimpleJwt.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/HealthCheckService.kt b/domain/src/usecases/HealthCheckService.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/HealthCheckService.kt rename to domain/src/usecases/HealthCheckService.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/NoteService.kt b/domain/src/usecases/NoteService.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/NoteService.kt rename to domain/src/usecases/NoteService.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/UserService.kt b/domain/src/usecases/UserService.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/UserService.kt rename to domain/src/usecases/UserService.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/export/ExportUseCase.kt b/domain/src/usecases/export/ExportUseCase.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/export/ExportUseCase.kt rename to domain/src/usecases/export/ExportUseCase.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/export/ExportUseCaseImpl.kt b/domain/src/usecases/export/ExportUseCaseImpl.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/export/ExportUseCaseImpl.kt rename to domain/src/usecases/export/ExportUseCaseImpl.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/markdown/FlexmarkFactory.kt b/domain/src/usecases/markdown/FlexmarkFactory.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/markdown/FlexmarkFactory.kt rename to domain/src/usecases/markdown/FlexmarkFactory.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/markdown/MarkdownConverter.kt b/domain/src/usecases/markdown/MarkdownConverter.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/markdown/MarkdownConverter.kt rename to domain/src/usecases/markdown/MarkdownConverter.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/markdown/MarkdownConverterImpl.kt b/domain/src/usecases/markdown/MarkdownConverterImpl.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/markdown/MarkdownConverterImpl.kt rename to domain/src/usecases/markdown/MarkdownConverterImpl.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/search/SearchTermsParser.kt b/domain/src/usecases/search/SearchTermsParser.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/search/SearchTermsParser.kt rename to domain/src/usecases/search/SearchTermsParser.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/delete/DeleteUseCaseImpl.kt b/domain/src/usecases/users/delete/DeleteUseCaseImpl.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/delete/DeleteUseCaseImpl.kt rename to domain/src/usecases/users/delete/DeleteUseCaseImpl.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/delete/DeleteUsecase.kt b/domain/src/usecases/users/delete/DeleteUsecase.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/delete/DeleteUsecase.kt rename to domain/src/usecases/users/delete/DeleteUsecase.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/login/LoginUseCaseImpl.kt b/domain/src/usecases/users/login/LoginUseCaseImpl.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/login/LoginUseCaseImpl.kt rename to domain/src/usecases/users/login/LoginUseCaseImpl.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/login/LoginUsecase.kt b/domain/src/usecases/users/login/LoginUsecase.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/login/LoginUsecase.kt rename to domain/src/usecases/users/login/LoginUsecase.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/register/RegisterUseCaseImpl.kt b/domain/src/usecases/users/register/RegisterUseCaseImpl.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/register/RegisterUseCaseImpl.kt rename to domain/src/usecases/users/register/RegisterUseCaseImpl.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/register/RegisterUsecase.kt b/domain/src/usecases/users/register/RegisterUsecase.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/register/RegisterUsecase.kt rename to domain/src/usecases/users/register/RegisterUsecase.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/validation/NoteValidations.kt b/domain/src/validation/NoteValidations.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/validation/NoteValidations.kt rename to domain/src/validation/NoteValidations.kt diff --git a/simplenotes-domain/src/main/kotlin/be/simplenotes/domain/validation/UserValidations.kt b/domain/src/validation/UserValidations.kt similarity index 100% rename from simplenotes-domain/src/main/kotlin/be/simplenotes/domain/validation/UserValidations.kt rename to domain/src/validation/UserValidations.kt diff --git a/domain/test/Index.kt b/domain/test/Index.kt new file mode 100644 index 0000000..c2a7303 --- /dev/null +++ b/domain/test/Index.kt @@ -0,0 +1 @@ +package be.simplenotes.domain diff --git a/simplenotes-domain/src/test/kotlin/be/simplenotes/domain/security/LoggedInUserExtractorTest.kt b/domain/test/security/LoggedInUserExtractorTest.kt similarity index 100% rename from simplenotes-domain/src/test/kotlin/be/simplenotes/domain/security/LoggedInUserExtractorTest.kt rename to domain/test/security/LoggedInUserExtractorTest.kt diff --git a/simplenotes-domain/src/test/kotlin/be/simplenotes/domain/testutils/ArrowAssertions.kt b/domain/test/testutils/ArrowAssertions.kt similarity index 100% rename from simplenotes-domain/src/test/kotlin/be/simplenotes/domain/testutils/ArrowAssertions.kt rename to domain/test/testutils/ArrowAssertions.kt diff --git a/simplenotes-domain/src/test/kotlin/be/simplenotes/domain/usecases/search/SearchTermsParserKtTest.kt b/domain/test/usecases/search/SearchTermsParserKtTest.kt similarity index 100% rename from simplenotes-domain/src/test/kotlin/be/simplenotes/domain/usecases/search/SearchTermsParserKtTest.kt rename to domain/test/usecases/search/SearchTermsParserKtTest.kt diff --git a/simplenotes-domain/src/test/kotlin/be/simplenotes/domain/usecases/users/login/LoginUseCaseImplTest.kt b/domain/test/usecases/users/login/LoginUseCaseImplTest.kt similarity index 100% rename from simplenotes-domain/src/test/kotlin/be/simplenotes/domain/usecases/users/login/LoginUseCaseImplTest.kt rename to domain/test/usecases/users/login/LoginUseCaseImplTest.kt diff --git a/simplenotes-domain/src/test/kotlin/be/simplenotes/domain/usecases/users/register/RegisterUseCaseImplTest.kt b/domain/test/usecases/users/register/RegisterUseCaseImplTest.kt similarity index 100% rename from simplenotes-domain/src/test/kotlin/be/simplenotes/domain/usecases/users/register/RegisterUseCaseImplTest.kt rename to domain/test/usecases/users/register/RegisterUseCaseImplTest.kt diff --git a/simplenotes-domain/src/test/kotlin/be/simplenotes/domain/validation/UserValidationsTest.kt b/domain/test/validation/UserValidationsTest.kt similarity index 100% rename from simplenotes-domain/src/test/kotlin/be/simplenotes/domain/validation/UserValidationsTest.kt rename to domain/test/validation/UserValidationsTest.kt diff --git a/simplenotes-persistance/build.gradle.kts b/persistance/build.gradle.kts similarity index 79% rename from simplenotes-persistance/build.gradle.kts rename to persistance/build.gradle.kts index 86cfbfe..1dec912 100644 --- a/simplenotes-persistance/build.gradle.kts +++ b/persistance/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } dependencies { - implementation(project(":simplenotes-types")) - implementation(project(":simplenotes-config")) + implementation(project(":types")) + 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(":simplenotes-config")) - testFixturesImplementation(project(":simplenotes-persistance")) + testFixturesImplementation(project(":types")) + testFixturesImplementation(project(":config")) + 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") diff --git a/simplenotes-persistance/src/main/resources/db/migration/mariadb/V1__Create_tables.sql b/persistance/resources/db/migration/mariadb/V1__Create_tables.sql similarity index 100% rename from simplenotes-persistance/src/main/resources/db/migration/mariadb/V1__Create_tables.sql rename to persistance/resources/db/migration/mariadb/V1__Create_tables.sql diff --git a/simplenotes-persistance/src/main/resources/db/migration/mariadb/V2__Add_deleted_column.sql b/persistance/resources/db/migration/mariadb/V2__Add_deleted_column.sql similarity index 100% rename from simplenotes-persistance/src/main/resources/db/migration/mariadb/V2__Add_deleted_column.sql rename to persistance/resources/db/migration/mariadb/V2__Add_deleted_column.sql diff --git a/simplenotes-persistance/src/main/resources/db/migration/mariadb/V3__Add_public_column.sql b/persistance/resources/db/migration/mariadb/V3__Add_public_column.sql similarity index 100% rename from simplenotes-persistance/src/main/resources/db/migration/mariadb/V3__Add_public_column.sql rename to persistance/resources/db/migration/mariadb/V3__Add_public_column.sql diff --git a/simplenotes-persistance/src/main/resources/db/migration/other/V1__Create_tables.sql b/persistance/resources/db/migration/other/V1__Create_tables.sql similarity index 100% rename from simplenotes-persistance/src/main/resources/db/migration/other/V1__Create_tables.sql rename to persistance/resources/db/migration/other/V1__Create_tables.sql diff --git a/simplenotes-persistance/src/main/resources/db/migration/other/V2__Add_deleted_column.sql b/persistance/resources/db/migration/other/V2__Add_deleted_column.sql similarity index 100% rename from simplenotes-persistance/src/main/resources/db/migration/other/V2__Add_deleted_column.sql rename to persistance/resources/db/migration/other/V2__Add_deleted_column.sql diff --git a/simplenotes-persistance/src/main/resources/db/migration/other/V3__Add_public_column.sql b/persistance/resources/db/migration/other/V3__Add_public_column.sql similarity index 100% rename from simplenotes-persistance/src/main/resources/db/migration/other/V3__Add_public_column.sql rename to persistance/resources/db/migration/other/V3__Add_public_column.sql diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/HealthCheck.kt b/persistance/src/HealthCheck.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/HealthCheck.kt rename to persistance/src/HealthCheck.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/Migrations.kt b/persistance/src/Migrations.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/Migrations.kt rename to persistance/src/Migrations.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/PersistanceModule.kt b/persistance/src/PersistanceModule.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/PersistanceModule.kt rename to persistance/src/PersistanceModule.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/converters/NoteConverter.kt b/persistance/src/converters/NoteConverter.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/converters/NoteConverter.kt rename to persistance/src/converters/NoteConverter.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/converters/UserConverter.kt b/persistance/src/converters/UserConverter.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/converters/UserConverter.kt rename to persistance/src/converters/UserConverter.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/extensions/KtormExtensions.kt b/persistance/src/extensions/KtormExtensions.kt similarity index 91% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/extensions/KtormExtensions.kt rename to persistance/src/extensions/KtormExtensions.kt index 525a1b3..f2a6ba4 100644 --- a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/extensions/KtormExtensions.kt +++ b/persistance/src/extensions/KtormExtensions.kt @@ -1,6 +1,7 @@ package be.simplenotes.persistance.extensions -import me.liuwj.ktorm.schema.* +import me.liuwj.ktorm.schema.BaseTable +import me.liuwj.ktorm.schema.SqlType import java.nio.ByteBuffer import java.sql.PreparedStatement import java.sql.ResultSet diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/NoteRepositoryImpl.kt b/persistance/src/notes/NoteRepositoryImpl.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/NoteRepositoryImpl.kt rename to persistance/src/notes/NoteRepositoryImpl.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/Notes.kt b/persistance/src/notes/Notes.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/Notes.kt rename to persistance/src/notes/Notes.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/Tags.kt b/persistance/src/notes/Tags.kt similarity index 77% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/Tags.kt rename to persistance/src/notes/Tags.kt index 476fc9d..c31c53a 100644 --- a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/notes/Tags.kt +++ b/persistance/src/notes/Tags.kt @@ -1,9 +1,12 @@ package be.simplenotes.persistance.notes import be.simplenotes.persistance.extensions.uuidBinary -import me.liuwj.ktorm.database.* -import me.liuwj.ktorm.entity.* -import me.liuwj.ktorm.schema.* +import me.liuwj.ktorm.database.Database +import me.liuwj.ktorm.entity.Entity +import me.liuwj.ktorm.entity.sequenceOf +import me.liuwj.ktorm.schema.Table +import me.liuwj.ktorm.schema.int +import me.liuwj.ktorm.schema.varchar internal open class Tags(alias: String?) : Table("Tags", alias) { companion object : Tags(null) diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/repositories/NoteRepository.kt b/persistance/src/repositories/NoteRepository.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/repositories/NoteRepository.kt rename to persistance/src/repositories/NoteRepository.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/repositories/UserRepository.kt b/persistance/src/repositories/UserRepository.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/repositories/UserRepository.kt rename to persistance/src/repositories/UserRepository.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/transactions/KtormTransactionService.kt b/persistance/src/transactions/KtormTransactionService.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/transactions/KtormTransactionService.kt rename to persistance/src/transactions/KtormTransactionService.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/transactions/TransactionService.kt b/persistance/src/transactions/TransactionService.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/transactions/TransactionService.kt rename to persistance/src/transactions/TransactionService.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/users/UserRepositoryImpl.kt b/persistance/src/users/UserRepositoryImpl.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/users/UserRepositoryImpl.kt rename to persistance/src/users/UserRepositoryImpl.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/users/Users.kt b/persistance/src/users/Users.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/users/Users.kt rename to persistance/src/users/Users.kt diff --git a/simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/utils/DataSourceConfigUtils.kt b/persistance/src/utils/DataSourceConfigUtils.kt similarity index 100% rename from simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/utils/DataSourceConfigUtils.kt rename to persistance/src/utils/DataSourceConfigUtils.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/DataSources.kt b/persistance/test/DataSources.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/DataSources.kt rename to persistance/test/DataSources.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/DbHealthCheckImplTest.kt b/persistance/test/DbHealthCheckImplTest.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/DbHealthCheckImplTest.kt rename to persistance/test/DbHealthCheckImplTest.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/DbTest.kt b/persistance/test/DbTest.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/DbTest.kt rename to persistance/test/DbTest.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/converters/NoteConverterTest.kt b/persistance/test/converters/NoteConverterTest.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/converters/NoteConverterTest.kt rename to persistance/test/converters/NoteConverterTest.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/converters/UserConverterTest.kt b/persistance/test/converters/UserConverterTest.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/converters/UserConverterTest.kt rename to persistance/test/converters/UserConverterTest.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/notes/BaseNoteRepositoryImplTest.kt b/persistance/test/notes/BaseNoteRepositoryImplTest.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/notes/BaseNoteRepositoryImplTest.kt rename to persistance/test/notes/BaseNoteRepositoryImplTest.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/notes/H2NoteRepositoryImplTests.kt b/persistance/test/notes/H2NoteRepositoryImplTests.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/notes/H2NoteRepositoryImplTests.kt rename to persistance/test/notes/H2NoteRepositoryImplTests.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/users/BaseUserRepositoryImplTest.kt b/persistance/test/users/BaseUserRepositoryImplTest.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/users/BaseUserRepositoryImplTest.kt rename to persistance/test/users/BaseUserRepositoryImplTest.kt diff --git a/simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/users/UserRepositoryImplTests.kt b/persistance/test/users/UserRepositoryImplTests.kt similarity index 100% rename from simplenotes-persistance/src/test/kotlin/be/simplenotes/persistance/users/UserRepositoryImplTests.kt rename to persistance/test/users/UserRepositoryImplTests.kt diff --git a/simplenotes-persistance/src/testFixtures/kotlin/be/simplenotes/persistance/DbTest.kt b/persistance/testfixtures/DbTest.kt similarity index 100% rename from simplenotes-persistance/src/testFixtures/kotlin/be/simplenotes/persistance/DbTest.kt rename to persistance/testfixtures/DbTest.kt diff --git a/simplenotes-persistance/src/testFixtures/kotlin/be/simplenotes/persistance/notes/NotesFixtures.kt b/persistance/testfixtures/notes/NotesFixtures.kt similarity index 100% rename from simplenotes-persistance/src/testFixtures/kotlin/be/simplenotes/persistance/notes/NotesFixtures.kt rename to persistance/testfixtures/notes/NotesFixtures.kt diff --git a/simplenotes-persistance/src/testFixtures/kotlin/be/simplenotes/persistance/users/UserFixtures.kt b/persistance/testfixtures/users/UserFixtures.kt similarity index 100% rename from simplenotes-persistance/src/testFixtures/kotlin/be/simplenotes/persistance/users/UserFixtures.kt rename to persistance/testfixtures/users/UserFixtures.kt diff --git a/simplenotes-persistance/src/test/resources/logback.xml b/persistance/testresources/logback.xml similarity index 100% rename from simplenotes-persistance/src/test/resources/logback.xml rename to persistance/testresources/logback.xml diff --git a/simplenotes-search/build.gradle.kts b/search/build.gradle.kts similarity index 89% rename from simplenotes-search/build.gradle.kts rename to search/build.gradle.kts index d5b3c87..8f4b9f9 100644 --- a/simplenotes-search/build.gradle.kts +++ b/search/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - implementation(project(":simplenotes-types")) + implementation(project(":types")) implementation(Libs.luceneCore) implementation(Libs.luceneQueryParser) diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/Constants.kt b/search/src/Constants.kt similarity index 100% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/Constants.kt rename to search/src/Constants.kt diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/Extractors.kt b/search/src/Extractors.kt similarity index 100% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/Extractors.kt rename to search/src/Extractors.kt diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/FieldConverters.kt b/search/src/FieldConverters.kt similarity index 100% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/FieldConverters.kt rename to search/src/FieldConverters.kt diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/LuceneDsl.kt b/search/src/LuceneDsl.kt similarity index 89% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/LuceneDsl.kt rename to search/src/LuceneDsl.kt index 0a5827e..fe6ad4f 100644 --- a/simplenotes-search/src/main/kotlin/be/simplenotes/search/LuceneDsl.kt +++ b/search/src/LuceneDsl.kt @@ -2,7 +2,10 @@ package be.simplenotes.search import org.apache.lucene.document.Document import org.apache.lucene.index.Term -import org.apache.lucene.search.* +import org.apache.lucene.search.BooleanClause +import org.apache.lucene.search.BooleanQuery +import org.apache.lucene.search.FuzzyQuery +import org.apache.lucene.search.IndexSearcher import org.slf4j.LoggerFactory private val logger = LoggerFactory.getLogger("be.simplenotes.search.dsl") diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/NoteSearcherImpl.kt b/search/src/NoteSearcherImpl.kt similarity index 100% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/NoteSearcherImpl.kt rename to search/src/NoteSearcherImpl.kt diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/SearchModule.kt b/search/src/SearchModule.kt similarity index 100% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/SearchModule.kt rename to search/src/SearchModule.kt diff --git a/simplenotes-search/src/main/kotlin/be/simplenotes/search/SearchUseCase.kt b/search/src/SearchUseCase.kt similarity index 100% rename from simplenotes-search/src/main/kotlin/be/simplenotes/search/SearchUseCase.kt rename to search/src/SearchUseCase.kt diff --git a/simplenotes-search/src/test/kotlin/be/simplenotes/search/NoteSearcherImplTest.kt b/search/test/NoteSearcherImplTest.kt similarity index 100% rename from simplenotes-search/src/test/kotlin/be/simplenotes/search/NoteSearcherImplTest.kt rename to search/test/NoteSearcherImplTest.kt diff --git a/simplenotes-search/src/test/kotlin/be/simplenotes/search/TagsFieldConverterTest.kt b/search/test/TagsFieldConverterTest.kt similarity index 100% rename from simplenotes-search/src/test/kotlin/be/simplenotes/search/TagsFieldConverterTest.kt rename to search/test/TagsFieldConverterTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 3d177c9..fcb747a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,8 @@ rootProject.name = "simplenotes" -include(":simplenotes-config") -include(":simplenotes-views") -include(":simplenotes-app") -include(":simplenotes-domain") -include(":simplenotes-search") -include(":simplenotes-types") -include(":simplenotes-persistance") +include(":config") +include(":views") +include(":app") +include(":domain") +include(":search") +include(":types") +include(":persistance") diff --git a/simplenotes-test-resources/src/test/resources/junit-platform.properties b/testresources/src/test/resources/junit-platform.properties similarity index 100% rename from simplenotes-test-resources/src/test/resources/junit-platform.properties rename to testresources/src/test/resources/junit-platform.properties diff --git a/simplenotes-types/build.gradle.kts b/types/build.gradle.kts similarity index 100% rename from simplenotes-types/build.gradle.kts rename to types/build.gradle.kts diff --git a/simplenotes-types/src/main/kotlin/be/simplenotes/types/Note.kt b/types/src/Note.kt similarity index 100% rename from simplenotes-types/src/main/kotlin/be/simplenotes/types/Note.kt rename to types/src/Note.kt diff --git a/simplenotes-types/src/main/kotlin/be/simplenotes/types/User.kt b/types/src/User.kt similarity index 100% rename from simplenotes-types/src/main/kotlin/be/simplenotes/types/User.kt rename to types/src/User.kt diff --git a/simplenotes-views/build.gradle.kts b/views/build.gradle.kts similarity index 85% rename from simplenotes-views/build.gradle.kts rename to views/build.gradle.kts index 6a49a8b..9a6df4a 100644 --- a/simplenotes-views/build.gradle.kts +++ b/views/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - implementation(project(":simplenotes-types")) + implementation(project(":types")) implementation(Libs.konform) implementation(Libs.kotlinxHtml) diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/BaseView.kt b/views/src/BaseView.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/BaseView.kt rename to views/src/BaseView.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/ErrorView.kt b/views/src/ErrorView.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/ErrorView.kt rename to views/src/ErrorView.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/NoteView.kt b/views/src/NoteView.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/NoteView.kt rename to views/src/NoteView.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/SettingView.kt b/views/src/SettingView.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/SettingView.kt rename to views/src/SettingView.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/UserView.kt b/views/src/UserView.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/UserView.kt rename to views/src/UserView.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/View.kt b/views/src/View.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/View.kt rename to views/src/View.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/components/Alerts.kt b/views/src/components/Alerts.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/components/Alerts.kt rename to views/src/components/Alerts.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/components/DeletedNoteTable.kt b/views/src/components/DeletedNoteTable.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/components/DeletedNoteTable.kt rename to views/src/components/DeletedNoteTable.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/components/Forms.kt b/views/src/components/Forms.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/components/Forms.kt rename to views/src/components/Forms.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/components/Navbar.kt b/views/src/components/Navbar.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/components/Navbar.kt rename to views/src/components/Navbar.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/components/NoteListHeader.kt b/views/src/components/NoteListHeader.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/components/NoteListHeader.kt rename to views/src/components/NoteListHeader.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/components/NoteTable.kt b/views/src/components/NoteTable.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/components/NoteTable.kt rename to views/src/components/NoteTable.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/extensions/KotlinxHtmlExtensions.kt b/views/src/extensions/KotlinxHtmlExtensions.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/extensions/KotlinxHtmlExtensions.kt rename to views/src/extensions/KotlinxHtmlExtensions.kt diff --git a/simplenotes-views/src/main/kotlin/be/simplenotes/views/utils/PrettyDate.kt b/views/src/utils/PrettyDate.kt similarity index 100% rename from simplenotes-views/src/main/kotlin/be/simplenotes/views/utils/PrettyDate.kt rename to views/src/utils/PrettyDate.kt