Merge pull request #6072 from espoon-voltti/dependabot/gradle/service…

…/kotlin-2.1.0 Bump kotlin from 2.0.0 to 2.1.0 in /service
espoon-voltti · Dec 2, 2024 · 9de7728 · 9de7728
2 parents 791f17b + 33cb435
commit 9de7728
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -195,6 +195,7 @@ allprojects {
         compilerOptions {
             jvmTarget = JvmTarget.fromTarget(libs.versions.java.get())
             allWarningsAsErrors = true
+            freeCompilerArgs = listOf("-Xconsistent-data-class-copy-visibility")
         }
     }
 

diff --git a/service/gradle/libs.versions.toml b/service/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ flyingsaucer = "9.4.0"
 flyway = "11.0.0"
 fuel = "2.3.1"
 java = "21"
-kotlin = "2.0.0"
+kotlin = "2.1.0"
 ktfmt = "0.21.0"
 ktlint = "1.4.0"
 ktlint-gradle = "12.1.0"

diff --git a/service/src/main/kotlin/fi/espoo/evaka/attachment/AttachmentQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/attachment/AttachmentQueries.kt
@@ -101,7 +101,7 @@ fun Database.Transaction.insertAttachment(
             sql(
                 """
 INSERT INTO attachment (created, name, content_type, application_id, income_statement_id, income_id, message_draft_id, pedagogical_document_id, fee_alteration_id, uploaded_by, type)
-VALUES (${bind(now)}, ${bind(name)}, ${bind(contentType)}, ${bind(fk.applicationId)}, ${bind(fk.incomeStatementId)}, ${bind(fk.incomeId)}, ${bind(fk.messageDraftId)}, ${bind(fk.pedagogicalDocumentId)}, ${bind(fk.feeAlterationId)}, ${bind(user.evakaUserId)}, ${bind(type ?: "")})
+VALUES (${bind(now)}, ${bind(name)}, ${bind(contentType)}, ${bind(fk.applicationId)}, ${bind(fk.incomeStatementId)}, ${bind(fk.incomeId)}, ${bind(fk.messageDraftId)}, ${bind(fk.pedagogicalDocumentId)}, ${bind(fk.feeAlterationId)}, ${bind(user.evakaUserId)}, ${bind(type?.name ?: "")})
 RETURNING id
 """
             )