Skip to content

Commit 3749976

Browse files
committed
Merge 24.11 to develop
2 parents 34081c7 + 8b774a3 commit 3749976

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ allprojects {
290290
// force consistency in TCRdb, WNPRC
291291
force "org.javassist:javassist:${javassistVersion}"
292292
force "org.jetbrains:annotations:${annotationsVersion}"
293+
// force consistency in TCRdb, mfa (Duo SDK)
294+
force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${intellijKotlinVersion}"
293295
// force consistency between API and Java remote API
294296
force "org.json:json:${orgJsonVersion}"
295297
force "org.ow2.asm:asm:${asmVersion}"

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ httpcore5Version=5.3.2
189189
httpclientVersion=4.5.14
190190
httpcoreVersion=4.4.16
191191

192+
intellijKotlinVersion=1.9.10
193+
192194
# Update all Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others
193195
jacksonVersion=2.18.2
194196
jacksonAnnotationsVersion=2.18.2

0 commit comments

Comments
 (0)