From bd77f6f7499e1d025252560cc2242594e104fd78 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Mon, 1 Aug 2022 18:51:12 +0200
Subject: [PATCH] Bumping to app-services v93.5.1, Glean v50.1.4

---
 buildSrc/src/main/java/Dependencies.kt              | 7 ++-----
 components/browser/engine-gecko/build.gradle        | 2 +-
 components/lib/crash/build.gradle                   | 2 +-
 components/support/migration/build.gradle           | 2 +-
 components/support/sync-telemetry/build.gradle      | 2 +-
 components/tooling/glean-gradle-plugin/build.gradle | 2 +-
 samples/glean/build.gradle                          | 2 +-
 samples/glean/samples-glean-library/build.gradle    | 2 +-
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 090eec14cab..26957c5eabd 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -30,12 +30,9 @@ object Versions {
     const val disklrucache = "2.0.2"
     const val leakcanary = "2.8.1"
 
-    const val mozilla_appservices = "93.5.0"
+    const val mozilla_appservices = "93.5.1"
 
-    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 mozilla_glean = "50.1.4"
 
     const val material = "1.2.1"
 
diff --git a/components/browser/engine-gecko/build.gradle b/components/browser/engine-gecko/build.gradle
index f072c02c25f..21e3baa9323 100644
--- 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_plugin}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         }
     }
 }
diff --git a/components/lib/crash/build.gradle b/components/lib/crash/build.gradle
index ba6aa2ffab7..4a287496f54 100644
--- 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_plugin}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         }
     }
 }
diff --git a/components/support/migration/build.gradle b/components/support/migration/build.gradle
index 642d17e0adc..dbfe2a1ebe9 100644
--- 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_plugin}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         }
     }
 }
diff --git a/components/support/sync-telemetry/build.gradle b/components/support/sync-telemetry/build.gradle
index eb275f5172b..7cad3a7c42e 100644
--- 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_plugin}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         }
     }
 }
diff --git a/components/tooling/glean-gradle-plugin/build.gradle b/components/tooling/glean-gradle-plugin/build.gradle
index 872d265a07b..6570d61b15b 100644
--- 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_plugin}"
+    implementation "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 
diff --git a/samples/glean/build.gradle b/samples/glean/build.gradle
index 0f263fb9ac0..92fd18d4eaf 100644
--- 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_plugin}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         }
     }
 }
diff --git a/samples/glean/samples-glean-library/build.gradle b/samples/glean/samples-glean-library/build.gradle
index 18e960f8c7f..073281bdfca 100644
--- 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_plugin}"
+            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
         }
     }
 }