Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/build.gradle b/build.gradle
index 82af965f00..336ebde839 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,13 +14,13 @@ buildscript {
         }
     }
 
-    ext.kotlin_version = '1.8.21'
+    ext.kotlin_version = '1.9.22'
 
     dependencies {
         classpath 'org.mozilla.apilint:apilint:0.5.2'
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'org.apache.commons:commons-exec:1.3'
-        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.18.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
         classpath 'org.tomlj:tomlj:1.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -60,7 +60,7 @@ allprojects {
         topsrcdir = gradle.mozconfig.topsrcdir
         topobjdir = gradle.mozconfig.topobjdir
 
-        gleanVersion = "57.0.0"
+        gleanVersion = "58.1.0"
         if (gleanVersion != getRustVersionFor("glean")) {
           throw new StopExecutionException("Mismatched Glean version, expected: ${gleanVersion}," +
               " found ${getRustVersionFor("glean")}")
@@ -98,7 +98,7 @@ allprojects {
     if (mozconfig.substs.ENABLE_MOZSEARCH_PLUGIN || mozconfig.substs.DOWNLOAD_ALL_GRADLE_DEPENDENCIES) {
         def targetRoot = new File(topobjdir, "mozsearch_java_index")
         def semanticdbJavacVersion = "com.sourcegraph:semanticdb-javac:0.9.6"
-        def semanticdbKotlincVersion = "com.sourcegraph:semanticdb-kotlinc:0.3.2"
+        def semanticdbKotlincVersion = "com.sourcegraph:semanticdb-kotlinc:0.4.0"
 
         afterEvaluate {
             def addDependencyToConfigurationIfExists = { configurationName, dependency ->
@@ -401,7 +401,7 @@ subprojects {
                 include '**/*.kt'
                 exclude '**/thirdparty/**'
             }
-            ktlint('0.48.2')
+            ktlint('0.49.1')
         }
     }
 }