diff --git a/app/build.gradle b/app/build.gradle index 0a97f905d90..cde8368e78d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -135,28 +135,28 @@ dependencies { compileOnly 'net.jcip:jcip-annotations:1.0' implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation "org.mozilla.components:browser-engine-gecko:$mozilla_components_version" - implementation "org.mozilla.components:browser-domains:$mozilla_components_version" - implementation "org.mozilla.components:browser-errorpages:$mozilla_components_version" - implementation "org.mozilla.components:browser-search:$mozilla_components_version" - implementation "org.mozilla.components:browser-session:$mozilla_components_version" - implementation "org.mozilla.components:browser-state:$mozilla_components_version" - implementation "org.mozilla.components:concept-engine:$mozilla_components_version" - implementation "org.mozilla.components:concept-fetch:$mozilla_components_version" - implementation "org.mozilla.components:feature-app-links:$mozilla_components_version" - implementation "org.mozilla.components:feature-customtabs:$mozilla_components_version" - implementation "org.mozilla.components:feature-contextmenu:$mozilla_components_version" - implementation "org.mozilla.components:feature-downloads:$mozilla_components_version" - implementation "org.mozilla.components:feature-findinpage:$mozilla_components_version" - implementation "org.mozilla.components:feature-prompts:$mozilla_components_version" - implementation "org.mozilla.components:feature-session:$mozilla_components_version" - implementation "org.mozilla.components:feature-tabs:$mozilla_components_version" - implementation "org.mozilla.components:lib-crash:$mozilla_components_version" + implementation "org.mozilla.components:browser-engine-gecko:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:browser-domains:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:browser-errorpages:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:browser-search:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:browser-session:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:browser-state:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:concept-engine:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:concept-fetch:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-app-links:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-customtabs:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-contextmenu:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-downloads:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-findinpage:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-prompts:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-session:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:feature-tabs:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:lib-crash:${AndroidComponents.VERSION}" implementation "org.mozilla.components:service-telemetry:$mozilla_components_version_telemetry" - implementation "org.mozilla.components:support-ktx:$mozilla_components_version" - implementation "org.mozilla.components:support-utils:$mozilla_components_version" - implementation "org.mozilla.components:ui-autocomplete:$mozilla_components_version" - implementation "org.mozilla.components:ui-colors:$mozilla_components_version" + implementation "org.mozilla.components:support-ktx:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:support-utils:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:ui-autocomplete:${AndroidComponents.VERSION}" + implementation "org.mozilla.components:ui-colors:${AndroidComponents.VERSION}" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutines_version}" @@ -185,7 +185,7 @@ dependencies { androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.11.0' testImplementation 'com.squareup.okhttp3:mockwebserver:3.11.0' - testImplementation "org.mozilla.components:lib-fetch-okhttp:$mozilla_components_version" + testImplementation "org.mozilla.components:lib-fetch-okhttp:${AndroidComponents.VERSION}" androidTestImplementation "tools.fastlane:screengrab:2.0.0", { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/build.gradle b/build.gradle index 36a647c7587..335b6af584d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ buildscript { ext.espresso_version = '3.1.0-alpha4' ext.kotlin_version = '1.4.30' ext.coroutines_version = '1.4.2' - ext.mozilla_components_version = '74.0.20210317190149' // Pinning the last working version of the service-telemetry component until we decide // what we want to do with telemetry in the app. ext.mozilla_components_version_telemetry = '57.0.9' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 00000000000..029b690452d --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,12 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +plugins { + id "org.gradle.kotlin.kotlin-dsl" version "1.3.6" +} + +repositories { + mavenCentral() +} + diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt new file mode 100644 index 00000000000..80861589b30 --- /dev/null +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -0,0 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +object AndroidComponents { + const val VERSION = "75.0.20210330143044" +}