Skip to content

Commit

Permalink
upgrading to kotlin 2.0 and fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
kant committed Jan 21, 2025
1 parent 1564839 commit 5487898
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Dfile.encoding=UTF8 -Xmx2048M
# Set Kotlin version for all peices of the build environment
systemProp.kotlinVersion=1.9.25
systemProp.kotlinVersion=2.1.0
8 changes: 3 additions & 5 deletions prime-router/src/main/kotlin/azure/EmailEngineFunction.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.sendgrid.helpers.mail.Mail
import com.sendgrid.helpers.mail.objects.Email
import com.sendgrid.helpers.mail.objects.Personalization
import gov.cdc.prime.router.azure.db.enums.SettingType
import gov.cdc.prime.router.azure.db.tables.pojos.Setting
import gov.cdc.prime.router.common.BaseEngine
import gov.cdc.prime.router.common.HttpClientUtils
import gov.cdc.prime.router.secrets.SecretHelper
Expand Down Expand Up @@ -227,12 +228,9 @@ class EmailScheduleEngine {
* @returns List of all organizations supported
*/
private fun fetchAllOrgs(): Iterable<String> {
@Suppress("NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER")
return workflowEngine.db.transactReturning { tx ->
@Suppress("UNRESOLVED_REFERENCE")
val settings = workflowEngine.db.fetchSettings(SettingType.ORGANIZATION, tx)
@Suppress("NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER")
settings.map { it.getName() }
val settings: List<Setting> = workflowEngine.db.fetchSettings(SettingType.ORGANIZATION, tx)
settings.map { it.name }
}
}

Expand Down
1 change: 0 additions & 1 deletion prime-router/src/main/kotlin/azure/HistoryFunctions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ open class BaseHistoryFunction : Logging {
organizationName ?: authClaims.organization.name
)

@Suppress("NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER")
val reports = headers.sortedByDescending { it.createdAt }.map {
// removing the call for facilities for now so we can call a
// method directly to just get the facilities and display them then
Expand Down

0 comments on commit 5487898

Please sign in to comment.