hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Upgrade kotlin, kotlinx-html, gradle, shadow

Browse Source
This commit is contained in:
Hubert Van De Walle 2021-05-06 10:41:38 +02:00
parent 7ad8b7039b
commit 1e0fe12396
6 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildSrc/build.gradle.kts
View File

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

2
buildSrc/src/main/kotlin/be/simplenotes/Libs.kt
View File

@ -43,7 +43,7 @@ object Libs {
} }
object Kotlinx { 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 { object Serialization {
const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0" const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0"

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

@ -6,11 +6,6 @@ plugins {
repositories { repositories {
mavenCentral() 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" group = "be.simplenotes"

1
buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts
View File

@ -14,7 +14,6 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
when { when {
candidate.group == "org.eclipse.jetty" && candidate.version.startsWith("11.") -> reject("javax -> jakarta") 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")
} }
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
persistence/build.gradle.kts
View File

@ -26,7 +26,6 @@ dependencies {
testImplementation(Libs.Test.junit) testImplementation(Libs.Test.junit)
testImplementation(Libs.Test.assertJ) testImplementation(Libs.Test.assertJ)
testCompileOnly(Libs.Slf4J.logback) testCompileOnly(Libs.Slf4J.logback)
testImplementation(Libs.Test.mariaTestContainer)
testFixturesImplementation(project(":types")) testFixturesImplementation(project(":types"))
testFixturesImplementation(project(":config")) testFixturesImplementation(project(":config"))
@ -38,7 +37,6 @@ dependencies {
testFixturesImplementation(Libs.snakeyaml) testFixturesImplementation(Libs.snakeyaml)
testFixturesImplementation(Libs.Test.mariaTestContainer)
testFixturesImplementation(Libs.Database.flyway) testFixturesImplementation(Libs.Database.flyway)
testFixturesImplementation(Libs.Test.junit) testFixturesImplementation(Libs.Test.junit)
testFixturesImplementation(Libs.Database.Ktorm.core) testFixturesImplementation(Libs.Database.Ktorm.core)