Update Gradle and Develocity (#5201)

* Gradle 9.2.1
* Fix configuring the libs version catalog
* Update develocity to 4.0.3
* Update develocity-commonCustomUserData to 2.4.0

Author: osipxd

build-settings-logic/build.gradle.kts

@@ -89,6 +89,10 @@ val suppressGradlePluginVersionWarning by tasks.registering {
                             "*/\nabstract class EmbeddedKotlinPlugin",
                             "*/\ninternal abstract class EmbeddedKotlinPlugin"
                         )
+                        // Convert parameter into receiver
+                        .replace(".configureEach { swift ->", ".configureEach {")
+                        .replace("swift.withDependencies { dependencies ->", "withDependencies {")
+                        .replace("dependencies.clear()", "clear()")
                 )
             }
         }

build-settings-logic/settings.gradle.kts

@@ -4,7 +4,7 @@
 
 plugins {
     // Keep it in sync with libs.versions.toml
-    id("com.gradle.develocity") version "3.19.2"
+    id("com.gradle.develocity") version "4.0.3"
 }
 
 @Suppress("UnstableApiUsage")

build-settings-logic/src/main/kotlin/ktorsettings.dependency-resolution-management.settings.gradle.kts

@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs") {
-            if (file("../gradle/libs.versions.toml").exists()) {
+            if (!file("gradle/libs.versions.toml").exists() && file("../gradle/libs.versions.toml").exists()) {
                 from(files("../gradle/libs.versions.toml"))
             }
 

gradle/libs.versions.toml

@@ -83,8 +83,8 @@ tomlj = "1.1.1"
 zstd-jni = "1.5.7-3"
 
 # Keep it in sync with build-settings-logic/settings.gradle.kts
-develocity = "3.19.2" # Should be compatible with our server: ge.jetbrains.com
-develocity-commonCustomUserData = "2.3"
+develocity = "4.0.3" # Should be compatible with our server: ge.jetbrains.com
+develocity-commonCustomUserData = "2.4.0"
 gradleDoctor = "0.12.1"
 mavenPublishing = "0.34.0"
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME