Glean build system updated

MozillaReality · Dec 17, 2019 · 5401c31 · 5401c31
1 parent 236ed3c
commit 5401c31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'com.android.application'
 apply from: "$project.rootDir/tools/gradle/versionCode.gradle"
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
 
 def getGitHash = { ->
     def stdout = new ByteArrayOutputStream()
@@ -37,10 +38,9 @@ def getUseDebugSigningOnRelease = { ->
     return false
 }
 
-// Generate markdown docs for the collected metrics.
+// Glean: Generate markdown docs for the collected metrics.
 ext.gleanGenerateMarkdownDocs = true
 ext.gleanDocsDirectory = "$rootDir/docs"
-apply from: 'https://github.com/mozilla-mobile/android-components/raw/v' + deps.android_components_version + '/components/service/glean/scripts/sdk_generator.gradle'
 
 android {
     compileSdkVersion build_versions.target_sdk

diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
     addRepos(repositories)
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath "org.mozilla.telemetry:glean-gradle-plugin:$versions.android_components"
         classpath "$deps.kotlin.plugin"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/versions.gradle b/versions.gradle
@@ -50,6 +50,7 @@ versions.kotlin = "1.3.31"
 versions.kotlin_coroutines = "1.2.1"
 versions.snakeyaml = "1.24"
 versions.gson = "2.8.5"
+ext.versions = versions
 def deps = [:]
 
 def gecko_view = [:]