Merge branch '1.10.x' into 1.11.x

jonatan-ivanov · jonatan-ivanov · commit 4b192a0c3187 · 2023-10-05T17:32:32.000-07:00
diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.7.21"
+    id "org.jetbrains.kotlin.jvm" version "1.7.22"
     id 'me.champeau.mrjar' version "0.1.1"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id "org.jetbrains.kotlin.jvm" version "1.7.21"`
	`2`	`+ id "org.jetbrains.kotlin.jvm" version "1.7.22"`
`3`	`3`	`id 'me.champeau.mrjar' version "0.1.1"`
`4`	`4`	`}`
`5`	`5`