1791878 - Update to kotlin 1.7.20 and gradle plugin 7.3.0 or newer

Status: RESOLVED FIXED

(GeckoView :: General, task, P3)

Description

[Ryan VanderMeulen [:RyanVM]]

Doing these together because Kotlin 1.7 hits a bug with the 7.2.2 gradle plugin that causes linter failures otherwise.

Green on Try:
https://treeherder.mozilla.org/jobs?repo=try&revision=0c97c0e3dab12a493e89cb9676fc1c6f09e44c3d

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 1791878 - Synchronize Gradle and Kotlin with firefox-android.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

Updated Try push:
https://treeherder.mozilla.org/jobs?repo=try&revision=da29536157a9657f8c9a99ef33b2a989d1969579

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/216ebef85b80
Update to kotlin 1.7.20 and gradle plugin 7.3.0. r=geckoview-reviewers,m_kato

Comment 4

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/216ebef85b80

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Backed out for causing bug 1799002. We'll re-land after the patches in that bug have landed.
https://hg.mozilla.org/integration/autoland/rev/f48b00d07917c3449710ad21dec45299f224fa29

Comment 6

[BugBot [:suhaib / :marco/ :calixte]]

There's a r+ patch which didn't land and no activity in this bug for 2 weeks.
:RyanVM, could you have a look please?
If you still have some work to do, you can add an action "Plan Changes" in Phabricator.
For more information, please visit auto_nag documentation.

Comment 7

[Ryan VanderMeulen [:RyanVM]]

Nick, do we have an ETA on bug 1799002?

Comment 8

[Nick Alexander :nalexander [he/him]]

(In reply to Ryan VanderMeulen [:RyanVM] from comment #7)

Nick, do we have an ETA on bug 1799002?

I can commit to landing it in Firefox 109. If we care to, it should uplift to 108 fairly cleanly.

Comment 9

[Chris Peterson [:cpeterson]]

(In reply to Nick Alexander :nalexander [he/him] from comment #8)

(In reply to Ryan VanderMeulen [:RyanVM] from comment #7)

Nick, do we have an ETA on bug 1799002?

I can commit to landing it in Firefox 109. If we care to, it should uplift to 108 fairly cleanly.

Nick or Ryan, looks like this Kotlin and Gradle update didn't land in Nightly 109. Do you plan to fix this bug (and the multi-locale packaging regression bug 1799002) in Nightly 110?

Comment 10

[Ryan VanderMeulen [:RyanVM]]

Deferring to Nick on that. But given that we're in the soft freeze at this point, 110 seems more realistic, yes.

Comment 11

[Chris Peterson [:cpeterson]]

Clearing the version status flags because we don't need to track affected status for tasks like updating tools.

Comment 12

[Chris Peterson [:cpeterson]]

Kotlin was updated to 1.8.10 in bug 1820233, so this bug is just about updating the gradle plugin to 7.3.0 after bug 1799002 is fixed.

Comment 13

[Ryan VanderMeulen [:RyanVM]]

This is about updating mozilla-central, not Fenix (hence being filed in the GeckoView product).

Comment 14

[Ryan VanderMeulen [:RyanVM]]

I rebased and updated to the versions currently in use in the firefox-android repo. Unfortunately, there's new bustage :(
https://treeherder.mozilla.org/logviewer?job_id=411518453&repo=try&lineNumber=71915

FAILURE: Build failed with an exception.
* What went wrong:
Execution failed for task ':geckoview:mergeWithGeckoBinariesDebugJniLibFolders'.
> [x86_64/libnssckbi.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libnssckbi.so	[x86_64/libnssckbi.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libnssckbi.so: Error: Duplicate resources
  [x86_64/libipcclientcerts.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libipcclientcerts.so	[x86_64/libipcclientcerts.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libipcclientcerts.so: Error: Duplicate resources
  [x86_64/libplugin-container.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libplugin-container.so	[x86_64/libplugin-container.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libplugin-container.so: Error: Duplicate resources
  [x86_64/libmozavutil.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libmozavutil.so	[x86_64/libmozavutil.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libmozavutil.so: Error: Duplicate resources
  [x86_64/libmozavcodec.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libmozavcodec.so	[x86_64/libmozavcodec.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libmozavcodec.so: Error: Duplicate resources
  [x86_64/liblgpllibs.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/liblgpllibs.so	[x86_64/liblgpllibs.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/liblgpllibs.so: Error: Duplicate resources
  [x86_64/libxul.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libxul.so	[x86_64/libxul.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libxul.so: Error: Duplicate resources
  [x86_64/libsoftokn3.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libsoftokn3.so	[x86_64/libsoftokn3.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libsoftokn3.so: Error: Duplicate resources
  [x86_64/libfreebl3.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libfreebl3.so	[x86_64/libfreebl3.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libfreebl3.so: Error: Duplicate resources
  [x86_64/libnss3.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libnss3.so	[x86_64/libnss3.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libnss3.so: Error: Duplicate resources
  [x86_64/libmozglue.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libmozglue.so	[x86_64/libmozglue.so] /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/moz.build/src/withGeckoBinariesDebug/jniLibs/x86_64/libmozglue.so: Error: Duplicate resources

Full Try push:
https://treeherder.mozilla.org/jobs?repo=try&revision=5e429ed4401abb7dd6e84064af84cbd18f606462

Comment 15

[Ryan VanderMeulen [:RyanVM]]

Sounds like that may be https://issuetracker.google.com/issues/244063664. I did check to see if adding android.disableResourceValidation=true to gradle.properties helped, but the same bustage is still there.

Comment 16

[Ryan VanderMeulen [:RyanVM]]

I tried adding Nick's patch stack from bug 1799002 into the mix, but the end result there is that none of the compiled libraries end up in the final AARs. I downloaded one of them and it was only 11MB. And the gv-junit jobs predictably crash on startup.
https://treeherder.mozilla.org/jobs?repo=try&revision=bd656e7fb82f584a4723a18ba8d1841a9b62b9c4

Comment 17

[Ryan VanderMeulen [:RyanVM]]

Green on Try with AGP 7.3.1 instead of 7.4.1. No idea what'll happen with the stack from bug 1799002 applied on top.
https://treeherder.mozilla.org/jobs?repo=try&revision=42677726f19cb592ef29b934aef247b90e59f9a5

I've spent all the time on this that I care to, especially given the low priority this bug and its blockers have been seen as over the past 5 months. I've updated the Phabricator revision to what's green on Try and y'all can decide what to do from here with it.

Comment 18

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1791878 - Update to kotlin 1.7.20 and gradle plugin 7.3.0. r=geckoview-reviewers,m_kato

Comment 19

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/30b643127aa0
Update to kotlin 1.7.20 and gradle plugin 7.3.0. r=geckoview-reviewers,m_kato

Comment 20

[Cristina Horotan [:chorotan]]

https://hg.mozilla.org/mozilla-central/rev/30b643127aa0

Comment 21

[Nick Alexander :nalexander [he/him]]

Clearing NI.