diff --git a/build.gradle b/build.gradle index f22c96926d..4a5258118a 100644 --- a/build.gradle +++ b/build.gradle @@ -288,6 +288,8 @@ allprojects { // force consistency in TCRdb, WNPRC force "org.javassist:javassist:${javassistVersion}" force "org.jetbrains:annotations:${annotationsVersion}" + // force consistency in TCRdb, mfa (Duo SDK) + force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${intellijKotlinVersion}" // force consistency between API and Java remote API force "org.json:json:${orgJsonVersion}" force "org.ow2.asm:asm:${asmVersion}" diff --git a/gradle.properties b/gradle.properties index d06143c26e..34f1fda2bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ buildFromSource=true # The default version for LabKey artifacts that are built or that we depend on. # override in an individual module's gradle.properties file as necessary -labkeyVersion=24.11.5 +labkeyVersion=24.11.6 labkeyClientApiVersion=6.2.0 # Version numbers for the various binary artifacts that are included when @@ -190,6 +190,8 @@ httpcore5Version=5.3 httpclientVersion=4.5.14 httpcoreVersion=4.4.16 +intellijKotlinVersion=1.9.10 + # Jackson dependencies are usually released in tandem, but occasionally one gets a patch release out-of-sync with the others jacksonVersion=2.18.0 jacksonAnnotationsVersion=2.18.0