Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Update to Gradle 6.1.1, Android Gradle plugin 4.0.1, Kotlin 1.4 and Coroutines 1.3.9. #8717

Merged
merged 2 commits into from Oct 19, 2020

Conversation

pocmo
Copy link
Contributor

@pocmo pocmo commented Oct 16, 2020

This patch reintroduces the changes from PR #8360 that we reverted in PR #8623. Now the issues in
Fenix are resolved and we can land this again.

…oroutines 1.3.9.

This patch reintroduces the changes from PR mozilla-mobile#8360 that we reverted in PR mozilla-mobile#8623. Now the issues in
Fenix are resolved and we can land this again.
@pocmo pocmo added the 🕵️‍♀️ needs review PRs that need to be reviewed label Oct 16, 2020
@pocmo
Copy link
Contributor Author

pocmo commented Oct 16, 2020

That's a lot of CODEOWNER spam right here. But it does touch a lot of areas... 😅

Copy link
Member

@badboy badboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign-off for the Glean part.

Copy link
Contributor

@Amejia481 Amejia481 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good, just a few comments!

@@ -143,7 +143,7 @@ class WebAppSiteControlsFeature(
} else {
@Suppress("Deprecation")
Notification.Builder(applicationContext).apply {
setPriority(NotificationCompat.PRIORITY_MIN)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Is not always better to use the NotificationCompat version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If your builder is also a compat builder yes. But here in this part of the code it's a normal builder and then lint doesn't seem to like if you use the compat class.

@@ -84,6 +85,7 @@ class AndroidAssetFinder {
}
}

@SuppressLint("PackageManagerGetSignatures")
private fun PackageManager.getPackageSignatureInfo(packageName: String): PackageInfo? {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we open an issue for this or the suppressing is just fine? I'm not completely aware of the context of the suppression but the lint description looks a bit spooky

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue mentioned was already fixed in Android 4+. I am not sure why the lint check didn't complain previously. In our cases we always look at all certificates, so that seems fine.

@@ -172,6 +173,7 @@ object AccountSharing {
* but not signature rotation.
* @return A certificate SHA256 fingerprint, if one could be reliably obtained.
*/
@SuppressLint("PackageManagerGetSignatures")
fun getSignaturePreAPI28(packageManager: PackageManager, packageName: String): String? {
Copy link
Contributor

@Amejia481 Amejia481 Oct 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code looks similar to what we have in AndroidAssetFinder maybe we should file a issue to reuse and I have one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, although, afaik in a discussion with @grigoryk we said that we could get rid of this. I'll file something for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import java.lang.IllegalStateException
import org.mozilla.geckoview.WebNotification as GeckoViewWebNotification

@RunWith(AndroidJUnit4::class)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need these tests anymore?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still have GeckoWebNotificationDelegate.kt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonalmeida asked this in an earlier version of this PR, see here: #8359

@pocmo pocmo added 🛬 needs landing PRs that are ready to land and removed 🕵️‍♀️ needs review PRs that need to be reviewed labels Oct 19, 2020
@mergify mergify bot merged commit 1007c23 into mozilla-mobile:master Oct 19, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🛬 needs landing PRs that are ready to land
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants