Skip to content

Merge 24.11 to 25.1 #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 2 commits into from
Jan 28, 2025
Merged

Merge 24.11 to 25.1 #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b774a3
Force more recent version of jetbrains.kotlin (#968)
labkey-adam Jan 16, 2025
542d7f3
Merge 24.11 to 25.1
labkey-tchad Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading