Skip to content

Upgrade most dependencies #239

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
adrw merged 4 commits into from
Sep 18, 2025
Merged

Upgrade most dependencies #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c62c785
Upgrade most dependencies
mmollaverdi Sep 18, 2025
f9a506e
Fix a compile error
mmollaverdi Sep 18, 2025
c2fe7a6
Remove an unused build classpath dep
mmollaverdi Sep 18, 2025
0dbc4b4
Add junitLauncher dep to stop test tasks from failing
mmollaverdi Sep 18, 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
7 changes: 3 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ buildscript {
classpath(libs.kotlinGradlePlugin)
classpath(libs.mavenPublishGradlePlugin)
classpath(libs.shadowGradlePlugin)
classpath(libs.wireGradlePlugin)
}
}

Expand Down Expand Up @@ -73,9 +72,9 @@ subprojects {
// Only apply if the project has the kotlin plugin added:
plugins.withType<KotlinPluginWrapper> {
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
freeCompilerArgs.set(listOf("-Xjvm-default=all-compatibility"))
}
// dependsOn("spotlessKotlinApply")
}
Expand Down
53 changes: 26 additions & 27 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,57 @@
[versions]
aws2 = "2.31.30"
jackson = "2.14.3"
jetty = "12.0.9"
ktlint = "0.40.0"
kotlin = "1.9.23"
aws2 = "2.33.11"
jackson = "2.20.0"
jetty = "12.0.27"
kotlin = "2.2.10"
sqlite4java = "1.0.392"

[libraries]
antlr4Runtime = { module = "org.antlr:antlr4-runtime", version = "4.13.2" }
assertj = { module = "org.assertj:assertj-core", version = "3.23.1" }
assertj = { module = "org.assertj:assertj-core", version = "3.27.4" }
aws2Dynamodb = { module = "software.amazon.awssdk:dynamodb", version.ref = "aws2" }
aws2DynamodbEnhanced = { module = "software.amazon.awssdk:dynamodb-enhanced", version.ref = "aws2" }
aws2Pinpoint = { module = "software.amazon.awssdk:pinpoint", version.ref = "aws2" } # for DynamoDBLocal
awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.12.782" }
awsDynamodbLocal = { module = "com.amazonaws:DynamoDBLocal", version = "2.6.0" }
awsDynamodb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version = "1.12.791" }
awsDynamodbLocal = { module = "com.amazonaws:DynamoDBLocal", version = "2.6.1" }
clikt = { module = "com.github.ajalt:clikt", version = "2.8.0" }
commonsCli = { module = "commons-cli:commons-cli", version = "1.9.0" } # for DynamoDBLocal
commonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.17.0" } # for DynamoDBLocal
dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" }
dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.5.0" }
dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.5.0" }
commonsCli = { module = "commons-cli:commons-cli", version = "1.10.0" } # for DynamoDBLocal
commonsLang3 = { module = "org.apache.commons:commons-lang3", version = "3.18.0" } # for DynamoDBLocal
dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "2.0.0" }
dockerCore = { module = "com.github.docker-java:docker-java-core", version = "3.6.0" }
dockerTransport = { module = "com.github.docker-java:docker-java-transport-httpclient5", version = "3.6.0" }
findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
guava = { module = "com.google.guava:guava", version = "31.0.1-jre" }
guava = { module = "com.google.guava:guava", version = "33.4.8-jre" }
jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } # for DynamoDBLocal
jacksonDatatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } # for DynamoDBLocal
jettyAlpnClient = { module = "org.eclipse.jetty:jetty-alpn-client", version.ref = "jetty" } # for DynamoDBLocal
jettyClient = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty" } # for DynamoDBLocal
jettyServer = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" } # for DynamoDBLocal
junit4Api = { module = "junit:junit", version = "4.13.2" }
junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.8.2" }
junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.11.4" }
junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.13.4" }
junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.13.4" }
junitGradlePlugin = { module = "org.junit.platform:junit-platform-gradle-plugin", version = "1.2.0" }
junitLauncher = { module = "org.junit.platform:junit-platform-launcher", version = "1.8.2" }
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlinReflection = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
kotlinxCoroutinesJdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version = "1.6.4" }
kotlinxCoroutinesReactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version = "1.6.4" }
log4jCore = { module = "org.apache.logging.log4j:log4j-core", version = "2.17.1" }
loggingApi = { module = "io.github.microutils:kotlin-logging", version = "2.0.10" }
mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.31.0" }
kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.10.2" }
kotlinxCoroutinesJdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version = "1.10.2" }
kotlinxCoroutinesReactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version = "1.10.2" }
log4jCore = { module = "org.apache.logging.log4j:log4j-core", version = "2.25.1" }
loggingApi = { module = "io.github.microutils:kotlin-logging", version = "3.0.5" }
mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.33.0" }
moshiCore = { module = "com.squareup.moshi:moshi", version = "1.15.2" }
moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version = "1.15.2" }
nettyBom = { module = "io.netty:netty-bom", version = "4.1.79.Final" }
okio = { module = "com.squareup.okio:okio", version = "3.4.0" }
okioFakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version = "3.4.0" }
shadowGradlePlugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.6" }
nettyBom = { module = "io.netty:netty-bom", version = "4.2.6.Final" }
okio = { module = "com.squareup.okio:okio", version = "3.16.0" }
okioFakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version = "3.16.0" }
shadowGradlePlugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "9.1.0" }
slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.17" } # for DynamoDBLocal
sqlite4javaLinuxI386 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-i386", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaLinuxAmd64 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-amd64", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaOsx = { module = "com.almworks.sqlite4java:libsqlite4java-osx", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaWinX64 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x64", version.ref = "sqlite4java" } # for DynamoDBLocal
sqlite4javaWinX86 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x86", version.ref = "sqlite4java" } # for DynamoDBLocal
wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.8.1" }

[bundles]
jackson = ["jacksonDatabind", "jacksonDatatypeJsr310"]
Expand Down
8 changes: 4 additions & 4 deletions samples/guides-junit4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ tasks.withType<Test> {
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

Expand Down
10 changes: 6 additions & 4 deletions samples/guides-junit5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,22 @@ dependencies {
testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)

implementation(project(":tempest-testing-docker"))
implementation(project(":tempest-testing-jvm"))
implementation(project(":tempest-testing-junit5"))
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

Expand Down
8 changes: 4 additions & 4 deletions samples/guides/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ dependencies {
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

Expand Down
8 changes: 4 additions & 4 deletions samples/guides2-junit4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ tasks.withType<Test> {
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

Expand Down
10 changes: 6 additions & 4 deletions samples/guides2-junit5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,22 @@ dependencies {
testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)

implementation(project(":tempest2-testing-docker"))
implementation(project(":tempest2-testing-jvm"))
implementation(project(":tempest2-testing-junit5"))
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

Expand Down
8 changes: 4 additions & 4 deletions samples/guides2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ dependencies {
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

Expand Down
9 changes: 5 additions & 4 deletions samples/javarecord/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ dependencies {
testImplementation(project(":tempest-testing-junit5"))
testImplementation(libs.assertj)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)
}

val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_14.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_14)
}
}

val compileTestKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_14.toString()
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_14)
}
}

Expand Down
4 changes: 0 additions & 4 deletions samples/musiclibrary-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@ dependencies {
api(libs.findbugsJsr305)
implementation(libs.kotlinReflection)
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}
4 changes: 0 additions & 4 deletions samples/musiclibrary/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ plugins {
dependencies {
implementation(project(":tempest"))
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}
4 changes: 0 additions & 4 deletions samples/musiclibrary2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ plugins {
dependencies {
implementation(project(":tempest2"))
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}
4 changes: 0 additions & 4 deletions samples/urlshortener/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@ dependencies {
implementation(project(":tempest"))
implementation(libs.kotlinStdLib)
implementation(libs.clikt)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}
4 changes: 0 additions & 4 deletions samples/urlshortener2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@ dependencies {
implementation(project(":tempest2"))
implementation(libs.kotlinStdLib)
implementation(libs.clikt)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}
1 change: 1 addition & 0 deletions tempest-docker/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {

testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)
testImplementation(libs.assertj)
testImplementation(libs.okioFakefilesystem)
}
Expand Down
4 changes: 0 additions & 4 deletions tempest-internal/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ dependencies {
api(libs.findbugsJsr305)
implementation(libs.kotlinReflection)
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}


Expand Down
1 change: 1 addition & 0 deletions tempest-testing-docker/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies {

testImplementation(libs.assertj)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)
testImplementation(project(":samples:urlshortener"))
testImplementation(project(":tempest-testing-junit5"))
}
Expand Down
4 changes: 0 additions & 4 deletions tempest-testing-internal/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ dependencies {
api(libs.loggingApi)
implementation(libs.log4jCore)
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}


Expand Down
1 change: 1 addition & 0 deletions tempest-testing-junit5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies {
testImplementation(project(":tempest-testing-jvm"))
testImplementation(libs.assertj)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)
}


Expand Down
4 changes: 0 additions & 4 deletions tempest-testing-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ dependencies {
implementation(project(":tempest-testing-internal"))
implementation(project(":tempest-dynamodb-local"))
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}


Expand Down
4 changes: 0 additions & 4 deletions tempest-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ dependencies {
api(libs.findbugsJsr305)
api(libs.guava)
implementation(libs.kotlinStdLib)

testImplementation(libs.assertj)
testImplementation(libs.junitApi)
testImplementation(libs.junitEngine)
}


Expand Down
1 change: 1 addition & 0 deletions tempest/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies {
testImplementation(project(":tempest-testing-junit5"))
testImplementation(libs.assertj)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)
}


Expand Down
2 changes: 1 addition & 1 deletion tempest/src/main/kotlin/app/cash/tempest/internal/DynamoDbQueryable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ internal class DynamoDbQueryable<K : Any, I : Any>(
val specificAttributeNamesAliased = mutableListOf<String>()
val expressionAttributeNames = mutableMapOf<String, String>()
for (name in specificAttributeNames) {
val upperName = name.toUpperCase()
val upperName = name.uppercase()
if (reservedWords.contains(upperName)) {
val alias = "#$name"
specificAttributeNamesAliased.add(alias)
Expand Down
1 change: 1 addition & 0 deletions tempest2-testing-docker/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies {

testImplementation(libs.assertj)
testImplementation(libs.junitEngine)
testRuntimeOnly(libs.junitLauncher)
testImplementation(project(":samples:urlshortener2"))
testImplementation(project(":tempest2-testing-junit5"))
}
Expand Down
Loading
Loading