Update android dependencies [ci full] #4345
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,22 +3,27 @@ | |
| buildscript { | ||
|
|
||
| ext { | ||
| kotlin_version = '1.5.20' | ||
| kotlin_coroutines_version = '1.5.0' | ||
| jna_version = '5.8.0' | ||
|
Contributor
Author
There was a problem hiding this comment. By the way, this version of JNA seems to fix the struct-padding bug from mozilla/uniffi-rs#334 \o/ |
||
| android_gradle_plugin_version = '4.2.2' | ||
| android_components_version = '91.0.3' | ||
| androidx_annotation_version = '1.2.0' | ||
| androidx_core_version = '1.3.2' | ||
| androidx_test_core_version = '1.3.0' | ||
| androidx_test_junit_version = '1.1.2' | ||
| androidx_work_testing_version = '2.5.0' | ||
| androidx_test_runner_version = '1.3.0' | ||
| detekt_version = '1.17.1' | ||
| gradle_download_task_version = '3.4.3' | ||
| junit_version = '4.13' | ||
| maven_publish_version = '3.6.2' | ||
| mockito_core_version = '2.24.5' | ||
| roboelectric_core_version = '4.3.1' | ||
| rust_android_gradle_version = '0.8.3' | ||
| espresso_core_version = '3.3.0' | ||
| protobuf_version = '3.11.4' | ||
| gradle_protobuf_version = '0.8.14' | ||
| } | ||
|
|
||
| ext.build = [ | ||
|
|
@@ -49,20 +54,21 @@ buildscript { | |
|
|
||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:$android_gradle_plugin_version" | ||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||
|
Contributor
Author
There was a problem hiding this comment. TBH I'm not sure why things were working without this on our classpath, maybe we were just always using the "system" version of kotlin? |
||
|
|
||
| // Publish. | ||
| classpath "digital.wup:android-maven-publish:$maven_publish_version" | ||
|
|
||
| classpath "gradle.plugin.org.mozilla.rust-android-gradle:plugin:$rust_android_gradle_version" | ||
|
|
||
| // Yes, this is unusual. We want to access some host-specific | ||
| // computation at build time. | ||
| classpath "net.java.dev.jna:jna:$jna_version" | ||
|
|
||
| // Downloading libs/ archives from Taskcluster. | ||
| classpath "de.undercouch:gradle-download-task:$gradle_download_task_version" | ||
|
|
||
| classpath "com.google.protobuf:protobuf-gradle-plugin:$gradle_protobuf_version" | ||
|
|
||
| // Since the Glean version depends on the Android components version, | ||
| // it is very important to use a modern version of Glean and, ideally, | ||
|
|
@@ -75,7 +81,7 @@ buildscript { | |
| } | ||
|
|
||
| plugins { | ||
| id "io.gitlab.arturbosch.detekt" version "$detekt_version" | ||
| } | ||
|
|
||
| apply plugin: 'de.undercouch.download' | ||
|
|
@@ -138,6 +144,7 @@ if (useDownloadedLibs) { | |
| src { | ||
| switch (DefaultPlatform.RESOURCE_PREFIX) { | ||
| case 'darwin': | ||
| case 'darwin-x86-64': | ||
|
Contributor
Author
There was a problem hiding this comment. The name of the platform has changed in the latest release of JNA, for reasons to do with the M1 arm64 silicon stuff. |
||
| return "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.application-services.build.libs.desktop.macos.${rootProject.ext.libsGitSha}/artifacts/public/build/macos.tar.gz" | ||
| case 'linux-x86-64': | ||
| return "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.application-services.build.libs.desktop.linux.${rootProject.ext.libsGitSha}/artifacts/public/build/linux.tar.gz" | ||
|
|
@@ -154,6 +161,7 @@ if (useDownloadedLibs) { | |
| dest { | ||
| switch (DefaultPlatform.RESOURCE_PREFIX) { | ||
| case 'darwin': | ||
| case 'darwin-x86-64': | ||
| return new File(buildDir, "libs.desktop.macos.${rootProject.ext.libsGitSha}.tar.gz") | ||
| case 'linux-x86-64': | ||
| return new File(buildDir, "libs.desktop.linux.${rootProject.ext.libsGitSha}.tar.gz") | ||
|
|
@@ -220,6 +228,7 @@ ext.rustTargets = [ | |
| // Generate libs for our current platform so we can run unit tests. | ||
| switch (DefaultPlatform.RESOURCE_PREFIX) { | ||
| case 'darwin': | ||
| case 'darwin-x86-64': | ||
| ext.nativeRustTarget = 'darwin' | ||
| break | ||
| case 'linux-x86-64': | ||
|
|
@@ -277,7 +286,7 @@ ext.cargoExecWithSQLCipher = { spec, toolchain -> | |
| } | ||
|
|
||
| detekt { | ||
| toolVersion = "$detekt_version" | ||
| input = files( | ||
| fileTree(dir: "${projectDir}/components", excludes: ["external", "**/generated"]), | ||
| "${projectDir}/gradle-plugin", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -540,24 +540,24 @@ open class Nimbus( | |
| enrollmentChangeEvents.forEach { event -> | ||
| when (event.change) { | ||
| EnrollmentChangeEventType.ENROLLMENT -> { | ||
| NimbusEvents.enrollment.record(NimbusEvents.EnrollmentExtra( | ||
|
Contributor
Author
There was a problem hiding this comment. The previous Glean recording API is deprecated, and there's a new more strongly-typed one documented here. |
||
| experiment = event.experimentSlug, | ||
| branch = event.branchSlug, | ||
| enrollmentId = event.enrollmentId | ||
| )) | ||
| } | ||
| EnrollmentChangeEventType.DISQUALIFICATION -> { | ||
| NimbusEvents.disqualification.record(NimbusEvents.DisqualificationExtra( | ||
| experiment = event.experimentSlug, | ||
| branch = event.branchSlug, | ||
| enrollmentId = event.enrollmentId | ||
| )) | ||
| } | ||
| EnrollmentChangeEventType.UNENROLLMENT -> { | ||
| NimbusEvents.unenrollment.record(NimbusEvents.UnenrollmentExtra( | ||
| experiment = event.experimentSlug, | ||
| branch = event.branchSlug, | ||
| enrollmentId = event.enrollmentId | ||
| )) | ||
| } | ||
| } | ||
|
|
@@ -578,10 +578,10 @@ open class Nimbus( | |
| internal fun recordExposureOnThisThread(featureId: String) = withCatchAll { | ||
| val activeExperiments = getActiveExperiments() | ||
| activeExperiments.find { it.featureIds.contains(featureId) }?.also { experiment -> | ||
| NimbusEvents.exposure.record(NimbusEvents.ExposureExtra( | ||
| experiment = experiment.slug, | ||
| branch = experiment.branchSlug, | ||
| enrollmentId = experiment.enrollmentId | ||
| )) | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These were newly triggering some
detektfailures. I've disabled the ones that are disabled in a-c, and fixed the others.