Skip to content
Merged

Bumps #652

Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {


dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
implementation("org.jetbrains.kotlin:kotlin-serialization:2.3.21")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.21")
implementation("org.jetbrains.kotlin:kotlin-serialization:2.4.21")
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.2.0")
}
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
handlebars = 'com.github.jknack:handlebars:4.5.0'
jetbrains-annotations = 'org.jetbrains:annotations:26.0.2-1'
jspecify = 'org.jspecify:jspecify:1.0.0'
jwt = 'com.nimbusds:nimbus-jose-jwt:9.47'
jwt = 'com.nimbusds:nimbus-jose-jwt:10.10'
mutiny = 'io.smallrye.reactive:mutiny:2.7.0'
reactiverse-contextual-logging = 'io.reactiverse:reactiverse-contextual-logging:1.2.1'
slf4j-nop = 'org.slf4j:slf4j-nop:2.0.16'
testcontainers = 'org.testcontainers:testcontainers:1.21.4'
tink = 'com.google.crypto.tink:tink:1.18.0'
tink = 'com.google.crypto.tink:tink:1.23.0'
tomcat-annotations = 'org.apache.tomcat:annotations-api:6.0.53'
bytebuddy = "net.bytebuddy:byte-buddy:1.18.3"
objenesis = "org.objenesis:objenesis:3.4"
Expand Down Expand Up @@ -302,9 +302,9 @@
grpc = '1.70.0'
jackson = '2.22.0'
junit = '5.14.1'
kotlinx-coroutines = '1.10.2'
kotlinx-serialization = '1.9.0'
ksp = '2.3.0'
kotlinx-coroutines = '1.11.0'
kotlinx-serialization = '1.11.0'
ksp = '2.3.12'
log4j = '2.24.3'
micrometer = '1.14.14'
micrometer-context-propagation = '1.1.3'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 6 additions & 2 deletions sdk-core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import com.google.devtools.ksp.gradle.KspAATask
import org.gradle.kotlin.dsl.withType
import org.jetbrains.dokka.gradle.tasks.DokkaGenerateTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
Expand Down Expand Up @@ -261,8 +262,8 @@ tasks
// ===========================================================================
// Code generation: protobuf, jsonSchema2Pojo, ksp
//
// Downstream consumers of the generated sources (compile/jar/dokka) are wired in the Compilation
// section below.
// Downstream consumers of the generated sources (compile/ksp/jar/dokka) are wired in the
// Compilation section below.
// ===========================================================================

// Protobuf: the Restate wire protocol for the pure-Java state machine.
Expand Down Expand Up @@ -322,6 +323,9 @@ tasks {
)
}
withType<KotlinCompile>().configureEach { dependsOn(*codegen) }
// KSP scans the main source dirs, which include the generated proto sources. Not the full
// `codegen`: generateJsonSchema2Pojo depends on processResources, which depends on kspKotlin.
withType<KspAATask>().configureEach { dependsOn("generateProto") }
withType<org.gradle.jvm.tasks.Jar>().configureEach {
// Multi-release jar so the FFM overlay under META-INF/versions/23 is honored on JDK >= 23.
manifest { attributes("Multi-Release" to "true") }
Expand Down
Loading