Update kotlin 1.7.20
This commit is contained in:
3
.idea/kotlinc.xml
generated
3
.idea/kotlinc.xml
generated
@@ -3,4 +3,7 @@
|
||||
<component name="Kotlin2JvmCompilerArguments">
|
||||
<option name="jvmTarget" value="11" />
|
||||
</component>
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="version" value="1.7.20" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -6,7 +6,7 @@ plugins {
|
||||
jacoco
|
||||
|
||||
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.owasp.dependencycheck") version "6.1.1"
|
||||
@@ -26,8 +26,6 @@ repositories {
|
||||
tasks.withType<KotlinCompile> {
|
||||
kotlinOptions {
|
||||
jvmTarget = "11"
|
||||
sourceCompatibility = "11"
|
||||
targetCompatibility = "11"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,8 +63,8 @@ tasks.publishToMavenLocal {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20")
|
||||
implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.20")
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.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.datatype:jackson-datatype-joda:2.12.1")
|
||||
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("io.mockk:mockk:1.10.6")
|
||||
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")
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
kotlin.code.style=official
|
||||
kotlin_version=1.5.10
|
||||
systemProp.sonar.host.url=https://sonarcloud.io
|
||||
systemProp.sonar.projectKey=postgres-json
|
||||
systemProp.sonar.projectName=PostgresJson
|
||||
|
||||
@@ -106,7 +106,7 @@ class Connection(
|
||||
val result = exec(sql, values)
|
||||
val json = result.rows[0].getString(0)
|
||||
return if (json === null) {
|
||||
listOf<EntityI>() as List<R>
|
||||
emptyList()
|
||||
} else {
|
||||
serializer.deserializeList(json, typeReference)
|
||||
}.also {
|
||||
@@ -160,7 +160,7 @@ class Connection(
|
||||
}
|
||||
val json = firstLine.getString(0)
|
||||
val entities = if (json == null) {
|
||||
listOf<EntityI>() as List<R>
|
||||
emptyList()
|
||||
} else {
|
||||
serializer.deserializeList(json, typeReference)
|
||||
}
|
||||
@@ -328,7 +328,7 @@ class Connection(
|
||||
"""
|
||||
|$msg
|
||||
|
|
||||
|${parameters.joinToString(", ") { it.toString() }.prependIndent(" > ") ?: ""}
|
||||
|${parameters.joinToString(", ") { it.toString() }.prependIndent(" > ")}
|
||||
|${sql.prependIndent(" > ")}
|
||||
|${result?.let { "-----" }?.prependIndent(" > ") ?: ""}
|
||||
|${result?.columnNames()?.joinToString(" | ")?.prependIndent(" > ") ?: ""}
|
||||
@@ -345,7 +345,7 @@ class Connection(
|
||||
"""
|
||||
|$msg
|
||||
|
|
||||
|${parameters.map { ":" + it.key + " = " + it.value }.joinToString(", ").prependIndent(" > ") ?: ""}
|
||||
|${parameters.map { ":" + it.key + " = " + it.value }.joinToString(", ").prependIndent(" > ")}
|
||||
|${sql.prependIndent(" > ")}
|
||||
|${result?.let { "-----" }?.prependIndent(" > ") ?: ""}
|
||||
|${result?.columnNames()?.joinToString(" | ")?.prependIndent(" > ") ?: ""}
|
||||
|
||||
Reference in New Issue
Block a user