From 110dd732e217bbef1025b7a6236e064fedb41daf Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Tue, 16 Jul 2019 11:58:07 +0200 Subject: [PATCH] Use Mozilla Android Components 4.0.0. --- app/build.gradle | 4 +--- buildSrc/src/main/java/Dependencies.kt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1ac473056..e7f0045f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -450,9 +450,7 @@ task printGeckoviewVersions { } } -// Normally this should use the same version as the glean dependency. But since we are currently using AC snapshots we -// can't reference a git tag with a specific version here. So we are just using "master" and hoping for the best. -apply from: 'https://github.com/mozilla-mobile/android-components/raw/master/components/service/glean/scripts/sdk_generator.gradle' +apply from: 'https://github.com/mozilla-mobile/android-components/raw/v' + Versions.mozilla_android_components + '/components/service/glean/scripts/sdk_generator.gradle' // For production builds, the native code for all `org.mozilla.appservices` dependencies gets compiled together // into a single "megazord" build, and different megazords are published for different subsets of features. diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 8837d9403..44827ae86 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -2,7 +2,7 @@ * 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/. */ -private object Versions { +object Versions { const val kotlin = "1.3.30" const val coroutines = "1.2.1" const val android_gradle_plugin = "3.4.1" @@ -33,7 +33,7 @@ private object Versions { const val androidx_work = "2.0.1" const val google_material = "1.1.0-alpha07" - const val mozilla_android_components = "4.0.0-SNAPSHOT" + const val mozilla_android_components = "4.0.0" // Note that android-components also depends on application-services, // and in fact is our main source of appservices-related functionality. // The version number below tracks the application-services version