Merge branch 'main' into z/commandFactory

slackhq · Nov 30, 2023 · a8110c0 · a8110c0
2 parents c881ab6 + 2125fd5
commit a8110c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Install JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '20'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "1.9.21"
-kotlinx-serialization = "1.6.1"
+kotlinx-serialization = "1.6.2"
 ksp = "1.9.21-1.0.15"
 ktfmt = "0.46"
 jvmTarget = "17"
@@ -18,7 +18,7 @@ moshix = { id = "dev.zacsweers.moshix", version.ref = "moshix" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-spotless = { id = "com.diffplug.spotless", version = "6.22.0" }
+spotless = { id = "com.diffplug.spotless", version = "6.23.2" }
 binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
 retry = { id = "org.gradle.test-retry", version = "1.5.7" }