Commit cabd445a authored by MozLando's avatar MozLando
Browse files

Merge #5490 



5490: Use glean gradle plugin for internal a-c uses r=mdboom a=mdboom

This uses the Glean Gradle plugin for all uses internal to android-components.

This is a separate issue than using the Glean Gradle plugin for users external to android-components, which is currently blocked by #5476.



Co-authored-by: default avatarMichael Droettboom <mdboom@gmail.com>
parents 9871cd5d 99c4dc6d

buildSrc/src/main/java/Dependencies.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ object Versions { 


    const val mozilla_appservices = "0.47.0"



    const val mozilla_glean = "23.0.0"

    const val mozilla_glean = "23.0.1"



    const val material = "1.0.0"

    const val nearby = "17.0.0"

components/browser/engine-gecko-beta/build.gradle

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,18 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



buildscript {

    repositories {

        maven {

            url "https://maven.mozilla.org/maven2"

        }



        dependencies {

            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"

        }

    }

}



plugins {

    id "com.jetbrains.python.envs" version "0.0.26"

}
@@ -69,6 +81,6 @@ dependencies { 
    androidTestImplementation project(':tooling-fetch-tests')

}



apply from: '../../../components/service/glean/scripts/sdk_generator.gradle'

apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"

apply from: '../../../publish.gradle'

ext.configurePublish(config.componentsGroupId, archivesBaseName, project.ext.description)

components/browser/engine-gecko-nightly/build.gradle

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,18 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



buildscript {

    repositories {

        maven {

            url "https://maven.mozilla.org/maven2"

        }



        dependencies {

            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"

        }

    }

}



plugins {

    id "com.jetbrains.python.envs" version "0.0.26"

}
@@ -69,6 +81,6 @@ dependencies { 
    androidTestImplementation project(':tooling-fetch-tests')

}



apply from: '../../../components/service/glean/scripts/sdk_generator.gradle'

apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"

apply from: '../../../publish.gradle'

ext.configurePublish(config.componentsGroupId, archivesBaseName, project.ext.description)

components/browser/engine-gecko/build.gradle

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,18 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



buildscript {

    repositories {

        maven {

            url "https://maven.mozilla.org/maven2"

        }



        dependencies {

            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"

        }

    }

}



plugins {

    id "com.jetbrains.python.envs" version "0.0.26"

}
@@ -68,6 +80,6 @@ dependencies { 
    androidTestImplementation project(':tooling-fetch-tests')

}



apply from: '../../../components/service/glean/scripts/sdk_generator.gradle'

apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"

apply from: '../../../publish.gradle'

ext.configurePublish(config.componentsGroupId, archivesBaseName, project.ext.description)

components/lib/crash/build.gradle

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,18 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



buildscript {

    repositories {

        maven {

            url "https://maven.mozilla.org/maven2"

        }



        dependencies {

            classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"

        }

    }

}



plugins {

    id "com.jetbrains.python.envs" version "0.0.26"

}
@@ -59,6 +71,6 @@ dependencies { 
}



ext.gleanGenerateMarkdownDocs = true

apply from: '../../../components/service/glean/scripts/sdk_generator.gradle'

apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"

apply from: '../../../publish.gradle'

ext.configurePublish(config.componentsGroupId, archivesBaseName, project.ext.description)