Use patched Glean Gradle plugin to fix Windows build issues

The plugin has a single small change: mozilla/glean@1c95771
Alexandru2909 · Jun 20, 2022 · 8bda73a · 8bda73a
1 parent 99c8dab
commit 8bda73a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -33,6 +33,9 @@ object Versions {
     const val mozilla_appservices = "93.5.0"
 
     const val mozilla_glean = "50.1.0"
+    // FIXME(bug 1775073): Hack to deploy a tiny bug fix without requiring a full Glean update
+    // Will be removed with the next update again.
+    const val mozilla_glean_plugin = "50.1.1"
 
     const val material = "1.2.1"
 

diff --git a/components/browser/engine-gecko/build.gradle b/components/browser/engine-gecko/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
         }
     }
 }

diff --git a/components/lib/crash/build.gradle b/components/lib/crash/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
         }
     }
 }

diff --git a/components/support/migration/build.gradle b/components/support/migration/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
         }
     }
 }

diff --git a/components/support/sync-telemetry/build.gradle b/components/support/sync-telemetry/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
         }
     }
 }

diff --git a/components/tooling/glean-gradle-plugin/build.gradle b/components/tooling/glean-gradle-plugin/build.gradle
@@ -23,7 +23,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    implementation "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+    implementation "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 

diff --git a/samples/glean/build.gradle b/samples/glean/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
         }
     }
 }

diff --git a/samples/glean/samples-glean-library/build.gradle b/samples/glean/samples-glean-library/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ buildscript { @@
             }
             dependencies {
-                classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
+                classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean_plugin}"
             }
         }
     }
@@ Expand Down @@