diff --git a/build.gradle b/build.gradle index 6c4825fb21..41b8f02af2 100644 --- a/build.gradle +++ b/build.gradle @@ -290,6 +290,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 57ace15113..be27d44fdc 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=25.1.0 +labkeyVersion=25.1.1 labkeyClientApiVersion=6.2.0 # Version numbers for the various binary artifacts that are included when @@ -189,6 +189,8 @@ httpcore5Version=5.3.1 httpclientVersion=4.5.14 httpcoreVersion=4.4.16 +intellijKotlinVersion=1.9.10 + # Update all Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others jacksonVersion=2.18.2 jacksonAnnotationsVersion=2.18.2