corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1952504 - Add scip-java to version catalog and bump version to 0.10.4. r=android-reviewers,mcarare

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D240730
This commit is contained in:
Ryan VanderMeulen
2025-03-07 15:13:24 +00:00
parent 89eb9ce95d
commit 86cfedaccc
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -150,7 +150,6 @@ allprojects {
// NOTE: Kotlin code indexing is currently removed due to lack of Kotlin 2.x support (see bug 1938622) // 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) { if (mozconfig.substs.ENABLE_MOZSEARCH_PLUGIN || mozconfig.substs.DOWNLOAD_ALL_GRADLE_DEPENDENCIES) {
def targetRoot = new File(topobjdir, "mozsearch_java_index") def targetRoot = new File(topobjdir, "mozsearch_java_index")
def semanticdbJavacVersion = "com.sourcegraph:semanticdb-javac:0.10.3"
afterEvaluate { afterEvaluate {
def addDependencyToConfigurationIfExists = { configurationName, dependency -> def addDependencyToConfigurationIfExists = { configurationName, dependency ->
@@ -160,9 +159,9 @@ allprojects {
} }
} }
addDependencyToConfigurationIfExists("compileOnly", semanticdbJavacVersion) addDependencyToConfigurationIfExists("compileOnly", libs.semanticdb.java)
addDependencyToConfigurationIfExists("testCompileOnly", semanticdbJavacVersion) addDependencyToConfigurationIfExists("testCompileOnly", libs.semanticdb.java)
addDependencyToConfigurationIfExists("androidTestCompileOnly", semanticdbJavacVersion) addDependencyToConfigurationIfExists("androidTestCompileOnly", libs.semanticdb.java)
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

9
gradle/libs.versions.toml
View File

@@ -54,8 +54,6 @@ transition = "1.5.1"
viewpager2 = "1.1.0" viewpager2 = "1.1.0"
work = "2.10.0" work = "2.10.0"
protobuf-plugin = "0.9.4"
# Google versions # Google versions
accompanist = "0.37.0" accompanist = "0.37.0"
firebase-messaging = "24.1.0" firebase-messaging = "24.1.0"
@@ -67,6 +65,10 @@ play-services-base = "18.5.0"
play-services-fido = "21.1.0" play-services-fido = "21.1.0"
protobuf = "4.29.0" # Keep Protobuf in sync with the version used by AppServices. 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 # Kotlin versions
coroutines = "1.10.1" coroutines = "1.10.1"
kotlin = "2.1.10" # remember to change ksp-plugin 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-compiler = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }
protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", 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" } 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" } kotlin-annotations-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-annotations-jvm", version.ref = "kotlin" }
ktlint = { group = "com.pinterest", name = "ktlint", version.ref = "ktlint" } ktlint = { group = "com.pinterest", name = "ktlint", version.ref = "ktlint" }