diff --git a/build.gradle b/build.gradle index 002b48abfb0f..28ee62cd7301 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,6 @@ allprojects { // NOTE: Kotlin code indexing is currently removed due to lack of Kotlin 2.x support (see bug 1938622) 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.10.3" afterEvaluate { def addDependencyToConfigurationIfExists = { configurationName, dependency -> @@ -160,9 +159,9 @@ allprojects { } } - addDependencyToConfigurationIfExists("compileOnly", semanticdbJavacVersion) - addDependencyToConfigurationIfExists("testCompileOnly", semanticdbJavacVersion) - addDependencyToConfigurationIfExists("androidTestCompileOnly", semanticdbJavacVersion) + addDependencyToConfigurationIfExists("compileOnly", libs.semanticdb.java) + addDependencyToConfigurationIfExists("testCompileOnly", libs.semanticdb.java) + addDependencyToConfigurationIfExists("androidTestCompileOnly", libs.semanticdb.java) } tasks.withType(JavaCompile) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 684be9f31051..b6f2768f23af 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,8 +54,6 @@ transition = "1.5.1" viewpager2 = "1.1.0" work = "2.10.0" -protobuf-plugin = "0.9.4" - # Google versions accompanist = "0.37.0" firebase-messaging = "24.1.0" @@ -67,6 +65,10 @@ play-services-base = "18.5.0" play-services-fido = "21.1.0" protobuf = "4.29.0" # Keep Protobuf in sync with the version used by AppServices. +# Gradle plugins +protobuf-plugin = "0.9.4" +scip-java = "0.10.4" + # Kotlin versions coroutines = "1.10.1" kotlin = "2.1.10" # remember to change ksp-plugin @@ -222,6 +224,9 @@ play-services-fido = { group = "com.google.android.gms", name = "play-services-f protobuf-compiler = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" } protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "protobuf" } +# Gradle plugins +semanticdb-java = { group = "com.sourcegraph", name = "semanticdb-javac", version.ref = "scip-java" } + glean-gradle-plugin = { group = "org.mozilla.telemetry", name = "glean-gradle-plugin", version.ref = "mozilla-glean" } kotlin-annotations-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-annotations-jvm", version.ref = "kotlin" } ktlint = { group = "com.pinterest", name = "ktlint", version.ref = "ktlint" }