Update dependencies #31

Merged
flecomte merged 9 commits from update into master 2022-10-14 22:53:26 +02:00
4 changed files with 11 additions and 11 deletions
Showing only changes of commit fd23300677 - Show all commits

3
.idea/kotlinc.xml generated
View File

@@ -3,4 +3,7 @@
<component name="Kotlin2JvmCompilerArguments"> <component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="11" /> <option name="jvmTarget" value="11" />
</component> </component>
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.7.20" />
</component>
</project> </project>

View File

@@ -6,7 +6,7 @@ plugins {
jacoco jacoco
id("maven-publish") id("maven-publish")
kotlin("jvm") version "1.5.10" kotlin("jvm") version "1.7.20"
id("org.jlleitschuh.gradle.ktlint") version "10.0.0" id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
id("org.owasp.dependencycheck") version "6.1.1" id("org.owasp.dependencycheck") version "6.1.1"
@@ -26,8 +26,6 @@ repositories {
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "11"
sourceCompatibility = "11"
targetCompatibility = "11"
} }
} }
@@ -65,8 +63,8 @@ tasks.publishToMavenLocal {
} }
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.20") implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.1") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.1")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.1") implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.1")
implementation("com.github.jasync-sql:jasync-postgresql:1.1.7") implementation("com.github.jasync-sql:jasync-postgresql:1.1.7")
@@ -77,7 +75,7 @@ dependencies {
testImplementation("ch.qos.logback:logback-core:1.2.3") testImplementation("ch.qos.logback:logback-core:1.2.3")
testImplementation("io.mockk:mockk:1.10.6") testImplementation("io.mockk:mockk:1.10.6")
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.5.20") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.7.20")
testImplementation("org.amshove.kluent:kluent:1.65") testImplementation("org.amshove.kluent:kluent:1.65")
} }

View File

@@ -1,5 +1,4 @@
kotlin.code.style=official kotlin.code.style=official
kotlin_version=1.5.10
systemProp.sonar.host.url=https://sonarcloud.io systemProp.sonar.host.url=https://sonarcloud.io
systemProp.sonar.projectKey=postgres-json systemProp.sonar.projectKey=postgres-json
systemProp.sonar.projectName=PostgresJson systemProp.sonar.projectName=PostgresJson

View File

@@ -106,7 +106,7 @@ class Connection(
val result = exec(sql, values) val result = exec(sql, values)
val json = result.rows[0].getString(0) val json = result.rows[0].getString(0)
return if (json === null) { return if (json === null) {
listOf<EntityI>() as List<R> emptyList()
} else { } else {
serializer.deserializeList(json, typeReference) serializer.deserializeList(json, typeReference)
}.also { }.also {
@@ -160,7 +160,7 @@ class Connection(
} }
val json = firstLine.getString(0) val json = firstLine.getString(0)
val entities = if (json == null) { val entities = if (json == null) {
listOf<EntityI>() as List<R> emptyList()
} else { } else {
serializer.deserializeList(json, typeReference) serializer.deserializeList(json, typeReference)
} }
@@ -328,7 +328,7 @@ class Connection(
""" """
|$msg |$msg
| |
|${parameters.joinToString(", ") { it.toString() }.prependIndent(" > ") ?: ""} |${parameters.joinToString(", ") { it.toString() }.prependIndent(" > ")}
|${sql.prependIndent(" > ")} |${sql.prependIndent(" > ")}
|${result?.let { "-----" }?.prependIndent(" > ") ?: ""} |${result?.let { "-----" }?.prependIndent(" > ") ?: ""}
|${result?.columnNames()?.joinToString(" | ")?.prependIndent(" > ") ?: ""} |${result?.columnNames()?.joinToString(" | ")?.prependIndent(" > ") ?: ""}
@@ -345,7 +345,7 @@ class Connection(
""" """
|$msg |$msg
| |
|${parameters.map { ":" + it.key + " = " + it.value }.joinToString(", ").prependIndent(" > ") ?: ""} |${parameters.map { ":" + it.key + " = " + it.value }.joinToString(", ").prependIndent(" > ")}
|${sql.prependIndent(" > ")} |${sql.prependIndent(" > ")}
|${result?.let { "-----" }?.prependIndent(" > ") ?: ""} |${result?.let { "-----" }?.prependIndent(" > ") ?: ""}
|${result?.columnNames()?.joinToString(" | ")?.prependIndent(" > ") ?: ""} |${result?.columnNames()?.joinToString(" | ")?.prependIndent(" > ") ?: ""}