Merge branch 'main' into remove-develocity

trask · web-flow · commit 13d049147ac9 · 2024-12-02T10:31:46.000-08:00
diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts
@@ -15,8 +15,8 @@ java {
     }
 }
 
-var grpcVersion = "1.68.1" // CURRENT_GRPC_VERSION
-var protobufVersion = "4.28.3"
+var grpcVersion = "1.68.2" // CURRENT_GRPC_VERSION
+var protobufVersion = "4.29.0"
 var protocVersion = protobufVersion
 
 dependencies {
diff --git a/kotlin-extension/build.gradle.kts b/kotlin-extension/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id ("org.jetbrains.kotlin.jvm") version "2.0.21"
+    id ("org.jetbrains.kotlin.jvm") version "2.1.0"
 }
 
 description = "OpenTelemetry Example for Kotlin extensions"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@ pluginManagement {
         id("com.diffplug.spotless") version "6.25.0"
         id("com.github.johnrengelman.shadow") version "8.1.1"
         id("com.google.protobuf") version "0.9.4"
-        id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+        id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
         id("com.google.cloud.tools.jib") version "3.4.4"
         id("com.gradle.develocity") version "3.18.2"
     }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ java {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-var grpcVersion = "1.68.1" // CURRENT_GRPC_VERSION`
`19`		`-var protobufVersion = "4.28.3"`
	`18`	`+var grpcVersion = "1.68.2" // CURRENT_GRPC_VERSION`
	`19`	`+var protobufVersion = "4.29.0"`
`20`	`20`	`var protocVersion = protobufVersion`
`21`	`21`
`22`	`22`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id ("org.jetbrains.kotlin.jvm") version "2.0.21"`
	`2`	`+ id ("org.jetbrains.kotlin.jvm") version "2.1.0"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`description = "OpenTelemetry Example for Kotlin extensions"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ pluginManagement {`
`3`	`3`	`id("com.diffplug.spotless") version "6.25.0"`
`4`	`4`	`id("com.github.johnrengelman.shadow") version "8.1.1"`
`5`	`5`	`id("com.google.protobuf") version "0.9.4"`
`6`		`- id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"`
	`6`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"`
`7`	`7`	`id("com.google.cloud.tools.jib") version "3.4.4"`
`8`	`8`	`id("com.gradle.develocity") version "3.18.2"`
`9`	`9`	`}`