Merge branch '1.0.x' into 1.1.x

jonatan-ivanov · jonatan-ivanov · commit bf1d99be59ae · 2023-10-05T09:02:49.000-07:00
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.enterprise' version '3.15'
+	id 'com.gradle.enterprise' version '3.15.1'
 	id 'io.spring.ge.conventions' version '0.0.14'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pluginManagement {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`plugins {`
`8`		`- id 'com.gradle.enterprise' version '3.15'`
	`8`	`+ id 'com.gradle.enterprise' version '3.15.1'`
`9`	`9`	`id 'io.spring.ge.conventions' version '0.0.14'`
`10`	`10`	`id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'`
`11`	`11`	`}`