app/build.gradle.kts

@@ -1,3 +1,4 @@
+import be.simplenotes.Libs
 import be.simplenotes.micronaut
 
 plugins {
@@ -13,17 +14,20 @@ dependencies {
     implementation(project(":views"))
     implementation(project(":css"))
 
-    implementation(libs.http4k.core)
+    implementation(Libs.Http4k.core)
-    implementation(libs.bundles.jetty)
+    implementation(Libs.Jetty.server)
-    implementation(libs.kotlinx.serialization.json)
+    implementation(Libs.Jetty.servlet)
+    implementation(Libs.javaxServlet)
+    implementation(Libs.Kotlinx.Serialization.json)
 
-    implementation(libs.slf4j.api)
+    implementation(Libs.Slf4J.api)
-    runtimeOnly(libs.slf4j.logback)
+    runtimeOnly(Libs.Slf4J.logback)
 
     micronaut()
 
-    testImplementation(libs.bundles.test)
+    testImplementation(Libs.Test.junit)
-    testImplementation(libs.http4k.testing.hamkrest)
+    testImplementation(Libs.Test.assertJ)
+    testImplementation(Libs.Http4k.testingHamkrest)
 }
 
 docker {

buildSrc/build.gradle.kts

@@ -2,14 +2,18 @@ plugins {
     `kotlin-dsl`
 }
 
+kotlinDslPluginOptions {
+    experimentalWarning.set(false)
+}
+
 repositories {
     gradlePluginPortal()
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
-    implementation("org.jetbrains.kotlin:kotlin-serialization:1.5.0")
+    implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.31")
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
+    implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
     implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0")
 }

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

@@ -4,10 +4,86 @@ package be.simplenotes
 
 object Libs {
 
+    object Flexmark {
+        private const val version = "0.62.2"
+        const val core = "com.vladsch.flexmark:flexmark:$version"
+        const val tasklist = "com.vladsch.flexmark:flexmark-ext-gfm-tasklist:$version"
+    }
+
+    object Database {
+        const val flyway = "org.flywaydb:flyway-core:7.5.4"
+        const val hikariCP = "com.zaxxer:HikariCP:4.0.2"
+
+        object Drivers {
+            const val h2 = "com.h2database:h2:1.4.200"
+        }
+
+        object Ktorm {
+            const val core = "org.ktorm:ktorm-core:3.3.0"
+        }
+    }
+
+    object Lucene {
+        private const val version = "8.8.1"
+        const val core = "org.apache.lucene:lucene-core:$version"
+        const val analyzersCommon = "org.apache.lucene:lucene-analyzers-common:$version"
+        const val queryParser = "org.apache.lucene:lucene-queryparser:$version"
+    }
+
+    object Http4k {
+        private const val version = "4.3.5.4"
+        const val core = "org.http4k:http4k-core:$version"
+        const val testingHamkrest = "org.http4k:http4k-testing-hamkrest:$version"
+    }
+
+    object Jetty {
+        private const val version = "10.0.1"
+        const val server = "org.eclipse.jetty:jetty-server:$version"
+        const val servlet = "org.eclipse.jetty:jetty-servlet:$version"
+    }
+
+    object Kotlinx {
+        const val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2"
+
+        object Serialization {
+            const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0"
+        }
+    }
+
+    object Slf4J {
+        const val api = "org.slf4j:slf4j-api:2.0.0-alpha1"
+        const val logback = "ch.qos.logback:logback-classic:1.3.0-alpha5"
+    }
+
+    object Mapstruct {
+        private const val version = "1.4.2.Final"
+        const val core = "org.mapstruct:mapstruct:$version"
+        const val processor = "org.mapstruct:mapstruct-processor:$version"
+    }
+
     object Micronaut {
-        private const val version = "2.5.1"
+        private const val version = "2.3.3"
         const val inject = "io.micronaut:micronaut-inject:$version"
         const val processor = "io.micronaut:micronaut-inject-java:$version"
     }
 
+    const val arrowCoreData = "io.arrow-kt:arrow-core-data:0.11.0"
+    const val commonsCompress = "org.apache.commons:commons-compress:1.20"
+    const val javaJwt = "com.auth0:java-jwt:3.13.0"
+    const val javaxServlet = "javax.servlet:javax.servlet-api:4.0.1"
+    const val jbcrypt = "org.mindrot:jbcrypt:0.4"
+    const val konform = "io.konform:konform-jvm:0.2.0"
+    const val owaspHtmlSanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200713.1"
+    const val prettytime = "org.ocpsoft.prettytime:prettytime:5.0.0.Final"
+    const val snakeyaml = "org.yaml:snakeyaml:1.28"
+
+    object Test {
+        const val assertJ = "org.assertj:assertj-core:3.19.0"
+        const val hamkrest = "com.natpryce:hamkrest:1.8.0.1"
+        const val junit = "org.junit.jupiter:junit-jupiter:5.7.1"
+        const val mockk = "io.mockk:mockk:1.10.6"
+        const val faker = "com.github.javafaker:javafaker:1.0.2"
+        const val mariaTestContainer = "org.testcontainers:mariadb:1.15.2"
+    }
+
 }

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

@@ -6,6 +6,11 @@ plugins {
 
 repositories {
     mavenCentral()
+    maven {
+        url = uri("https://kotlin.bintray.com/kotlinx")
+        // https://github.com/Kotlin/kotlinx.html/issues/173
+        content { includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm") }
+    }
 }
 
 group = "be.simplenotes"

buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts

@@ -14,6 +14,7 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
 
                 when {
                     candidate.group == "org.eclipse.jetty" && candidate.version.startsWith("11.") -> reject("javax -> jakarta")
+                    candidate.group == "me.liuwj.ktorm" && candidate.version != "3.0.0" -> reject("SQL Case sensitivity changed")
                 }
             }
         }

config/build.gradle.kts

@@ -1,3 +1,4 @@
+import be.simplenotes.Libs
 import be.simplenotes.micronaut
 
 plugins {
@@ -8,6 +9,7 @@ plugins {
 dependencies {
     micronaut()
 
-    testImplementation(libs.bundles.test)
+    testImplementation(Libs.Test.junit)
-    testRuntimeOnly(libs.slf4j.logback)
+    testImplementation(Libs.Test.assertJ)
+    testRuntimeOnly(Libs.Slf4J.logback)
 }

domain/build.gradle.kts

@@ -1,3 +1,4 @@
+import be.simplenotes.Libs
 import be.simplenotes.micronaut
 
 plugins {
@@ -12,18 +13,21 @@ dependencies {
     implementation(project(":persistence"))
     implementation(project(":search"))
 
-    api(libs.arrow.core.data)
+    api(Libs.arrowCoreData)
-    api(libs.konform)
+    api(Libs.konform)
 
     micronaut()
 
-    implementation(libs.kotlinx.serialization.json)
+    implementation(Libs.Kotlinx.Serialization.json)
-    implementation(libs.bcrypt)
+    implementation(Libs.jbcrypt)
-    implementation(libs.jwt)
+    implementation(Libs.javaJwt)
-    implementation(libs.bundles.flexmark)
+    implementation(Libs.Flexmark.core)
-    implementation(libs.yaml)
+    implementation(Libs.Flexmark.tasklist)
-    implementation(libs.owasp.html.sanitizer)
+    implementation(Libs.snakeyaml)
-    implementation(libs.commonsCompress)
+    implementation(Libs.owaspHtmlSanitizer)
+    implementation(Libs.commonsCompress)
 
-    testImplementation(libs.bundles.test)
+    testImplementation(Libs.Test.hamkrest)
+    testImplementation(Libs.Test.junit)
+    testImplementation(Libs.Test.mockk)
 }

gradle/libs.versions.toml

@@ -1,61 +0,0 @@
-[versions]
-flexmark = "0.62.2"
-lucene = "8.8.2"
-http4k = "4.8.0.0"
-jetty = "10.0.2"
-mapstruct = "1.4.2.Final"
-micronaut-inject = "2.5.1"
-
-[libraries]
-flexmark-core = { module = "com.vladsch.flexmark:flexmark", version.ref = "flexmark" }
-flexmark-tasklist = { module = "com.vladsch.flexmark:flexmark-ext-gfm-tasklist", version.ref = "flexmark" }
-
-flyway = { module = "org.flywaydb:flyway-core", version = "7.8.2" }
-hikariCP = { module = "com.zaxxer:HikariCP", version = "4.0.3" }
-h2 = { module = "com.h2database:h2", version = "1.4.200" }
-ktorm = { module = "org.ktorm:ktorm-core", version = "3.3.0" }
-
-lucene-core = { module = "org.apache.lucene:lucene-core", version.ref = "lucene" }
-lucene-analyzers-common = { module = "org.apache.lucene:lucene-analyzers-common", version.ref = "lucene" }
-lucene-queryparser = { module = "org.apache.lucene:lucene-queryparser", version.ref = "lucene" }
-
-http4k-core = { module = "org.http4k:http4k-core", version.ref = "http4k" }
-http4k-testing-hamkrest = { module = "org.http4k:http4k-testing-hamkrest", version.ref = "http4k" }
-
-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" }
-javax-servlet = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
-
-kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.7.3" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm", version = "1.2.0" }
-
-slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.0-alpha1" }
-slf4j-logback = { module = "ch.qos.logback:logback-classic", version = "1.3.0-alpha5" }
-
-mapstruct-core = { module = "org.mapstruct:mapstruct", version.ref = "mapstruct" }
-mapstruct-processor = { module = "org.mapstruct:mapstruct-processor", version.ref = "mapstruct" }
-
-micronaut-inject = { module = "io.micronaut:micronaut-inject", version.ref = "micronaut-inject" }
-micronaut-processor = { module = "io.micronaut:micronaut-inject-java", version.ref = "micronaut-inject" }
-
-arrow-core-data = { module = "io.arrow-kt:arrow-core-data", version = "0.11.0" }
-commonsCompress = { module = "org.apache.commons:commons-compress", version = "1.20" }
-jwt = { module = "com.auth0:java-jwt", version = "3.15.0" }
-bcrypt = { module = "org.mindrot:jbcrypt", version = "0.4" }
-konform = { module = "io.konform:konform-jvm", version = "0.2.0" }
-owasp-html-sanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version = "20200713.1" }
-prettytime = { module = "org.ocpsoft.prettytime:prettytime", version = "5.0.1.Final" }
-yaml = { module = "org.yaml:snakeyaml", version = "1.28" }
-
-assertJ = { module = "org.assertj:assertj-core", version = "3.19.0" }
-hamkrest = { module = "com.natpryce:hamkrest", version = "1.8.0.1" }
-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.7.1" }
-mockk = { module = "io.mockk:mockk", version = "1.11.0" }
-faker = { module = "com.github.javafaker:javafaker", version = "1.0.2" }
-
-[bundles]
-flexmark = ["flexmark-core", "flexmark-tasklist"]
-database = ["flyway", "hikariCP", "h2", "ktorm"]
-lucene = ["lucene-core", "lucene-analyzers-common", "lucene-queryparser"]
-jetty = ["jetty-server", "jetty-servlet", "javax-servlet"]
-test = ["assertJ", "hamkrest", "junit-jupiter", "mockk"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

persistence/build.gradle.kts

@@ -1,3 +1,4 @@
+import be.simplenotes.Libs
 import be.simplenotes.micronaut
 
 plugins {
@@ -11,29 +12,37 @@ dependencies {
     implementation(project(":types"))
     implementation(project(":config"))
 
-    implementation(libs.bundles.database)
+    implementation(Libs.Database.Drivers.h2)
+    implementation(Libs.Database.flyway)
+    implementation(Libs.Database.hikariCP)
+    implementation(Libs.Database.Ktorm.core)
 
-    implementation(libs.slf4j.api)
+    implementation(Libs.Slf4J.api)
-    runtimeOnly(libs.slf4j.logback)
+    runtimeOnly(Libs.Slf4J.logback)
 
-    compileOnly(libs.mapstruct.core)
+    compileOnly(Libs.Mapstruct.core)
-    kapt(libs.mapstruct.processor)
+    kapt(Libs.Mapstruct.processor)
 
-    testImplementation(libs.bundles.test)
+    testImplementation(Libs.Test.junit)
-    testCompileOnly(libs.slf4j.logback)
+    testImplementation(Libs.Test.assertJ)
+    testCompileOnly(Libs.Slf4J.logback)
+    testImplementation(Libs.Test.mariaTestContainer)
 
     testFixturesImplementation(project(":types"))
     testFixturesImplementation(project(":config"))
     testFixturesImplementation(project(":persistence"))
 
-    testFixturesImplementation(libs.faker) {
+    testFixturesImplementation(Libs.Test.faker) {
         exclude(group = "org.yaml")
     }
 
-    testFixturesImplementation(libs.yaml)
+    testFixturesImplementation(Libs.snakeyaml)
 
-    testFixturesImplementation(libs.bundles.database)
+    testFixturesImplementation(Libs.Test.mariaTestContainer)
-    testFixturesImplementation(libs.junit.jupiter)
+    testFixturesImplementation(Libs.Database.flyway)
+    testFixturesImplementation(Libs.Test.junit)
+    testFixturesImplementation(Libs.Database.Ktorm.core)
+    testFixturesImplementation(Libs.Database.hikariCP)
 
     micronaut()
 

search/build.gradle.kts

@@ -1,3 +1,4 @@
+import be.simplenotes.Libs
 import be.simplenotes.micronaut
 
 plugins {
@@ -9,10 +10,13 @@ dependencies {
     implementation(project(":types"))
     implementation(project(":config"))
 
-    implementation(libs.bundles.lucene)
+    implementation(Libs.Lucene.core)
-    implementation(libs.slf4j.api)
+    implementation(Libs.Lucene.queryParser)
+    implementation(Libs.Lucene.analyzersCommon)
+    implementation(Libs.Slf4J.api)
 
     micronaut()
 
-    testImplementation(libs.bundles.test)
+    testImplementation(Libs.Test.junit)
+    testImplementation(Libs.Test.assertJ)
 }

settings.gradle.kts

@@ -8,5 +8,3 @@ include(":types")
 include(":persistence")
 include(":css")
 include(":junit-config")
-
-enableFeaturePreview("VERSION_CATALOGS")

types/build.gradle.kts

@@ -1,8 +1,10 @@
+import be.simplenotes.Libs
+
 plugins {
     id("be.simplenotes.base")
     id("be.simplenotes.kotlinx-serialization")
 }
 
 dependencies {
-    implementation(libs.kotlinx.serialization.json)
+    implementation(Libs.Kotlinx.Serialization.json)
 }

views/build.gradle.kts

@@ -1,3 +1,4 @@
+import be.simplenotes.Libs
 import be.simplenotes.micronaut
 
 plugins {
@@ -10,7 +11,7 @@ dependencies {
 
     micronaut()
 
-    implementation(libs.konform)
+    implementation(Libs.konform)
-    implementation(libs.kotlinx.html)
+    implementation(Libs.Kotlinx.html)
-    implementation(libs.prettytime)
+    implementation(Libs.prettytime)
 }