diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 19ca877..1108740 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -2,18 +2,14 @@ plugins { `kotlin-dsl` } -kotlinDslPluginOptions { - experimentalWarning.set(false) -} - repositories { gradlePluginPortal() } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31") - implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.31") - implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") + implementation("org.jetbrains.kotlin:kotlin-serialization:1.5.0") + implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0") implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0") implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0") } diff --git a/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt b/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt index 1182b42..b3a9418 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt +++ b/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt @@ -43,7 +43,7 @@ object Libs { } object Kotlinx { - const val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2" + const val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3" object Serialization { const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0" 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 4300b0e..14d4d4c 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts @@ -6,11 +6,6 @@ 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" diff --git a/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts index fae2790..5ec9bb2 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts @@ -14,7 +14,6 @@ tasks.named("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") } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..f371643 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts index 2f4f248..022167f 100644 --- a/persistence/build.gradle.kts +++ b/persistence/build.gradle.kts @@ -26,7 +26,6 @@ dependencies { testImplementation(Libs.Test.junit) testImplementation(Libs.Test.assertJ) testCompileOnly(Libs.Slf4J.logback) - testImplementation(Libs.Test.mariaTestContainer) testFixturesImplementation(project(":types")) testFixturesImplementation(project(":config")) @@ -38,7 +37,6 @@ dependencies { testFixturesImplementation(Libs.snakeyaml) - testFixturesImplementation(Libs.Test.mariaTestContainer) testFixturesImplementation(Libs.Database.flyway) testFixturesImplementation(Libs.Test.junit) testFixturesImplementation(Libs.Database.Ktorm.core)