Merge pull request #3554 from badboy/glean-megazord-submodule

Bug 1661539 - Add Glean to a iOS megazord build
mozilla · Sep 10, 2020 · 9ce6889 · 9ce6889
2 parents ac07ea8 + 0c1dece
commit 9ce6889
Show file tree

Hide file tree

Showing 15 changed files with 1,109 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,10 @@ xcuserdata
 # Protobuf Swift
 *.pb.swift
 
+# Glean generated artifacts
+megazords/ios/MozillaAppServices/Generated/Metrics.swift
+megazords/ios/.venv
+
 # Carthage generated artifacts
 Carthage
 MozillaAppServices.framework.zip

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "components/glean"]
+	path = components/glean
+	url = https://github.com/mozilla/glean
diff --git a/Cargo.lock b/Cargo.lock