Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: patch to use newer BlurView pom file #21095

Closed
wants to merge 2 commits into from
Closed

Conversation

siddarthkay
Copy link
Contributor

@siddarthkay siddarthkay commented Aug 20, 2024

Summary

This PR patches blur view library to use
com.github.Dimezis:BlurView:version-2.0.4 instead of com.github.Dimezis:BlurView:version-2.0.3

version 2.0.4 seems more reliable :

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

> curl -s https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom | md5sum
bc6f937d2ba82396257f6fc5f5247c0d  -

In this PR we also make sure that gradle deps are generated for patched nodejs deps.

Platforms

  • Android

status: ready

@status-im-auto
Copy link
Member

status-im-auto commented Aug 20, 2024

Jenkins Builds

Click to see older builds (8)
Commit #️⃣ Finished (UTC) Duration Platform Result
9559c90 #1 2024-08-20 14:33:12 ~3 min android-e2e 📄log
9559c90 #1 2024-08-20 14:33:16 ~3 min android 📄log
✔️ 9559c90 #1 2024-08-20 14:34:38 ~4 min tests 📄log
✔️ 9559c90 #1 2024-08-20 14:48:51 ~19 min ios 📱ipa 📲
✔️ 2865394 #2 2024-08-20 15:34:53 ~4 min tests 📄log
✔️ 2865394 #2 2024-08-20 15:38:39 ~8 min android-e2e 🤖apk 📲
✔️ 2865394 #2 2024-08-20 15:39:03 ~9 min android 🤖apk 📲
✔️ 2865394 #2 2024-08-20 15:53:45 ~23 min ios 📱ipa 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ cbac912 #4 2024-08-21 04:14:30 ~4 min tests 📄log
✔️ cbac912 #4 2024-08-21 04:16:31 ~6 min android-e2e 🤖apk 📲
✔️ cbac912 #4 2024-08-21 04:20:30 ~10 min android 🤖apk 📲
✔️ c4070e8 #5 2024-08-21 04:26:42 ~4 min tests 📄log
✔️ c4070e8 #5 2024-08-21 04:30:30 ~8 min android-e2e 🤖apk 📲
✔️ c4070e8 #5 2024-08-21 04:30:50 ~8 min android 🤖apk 📲
✔️ c4070e8 #5 2024-08-21 04:34:55 ~13 min ios 📱ipa 📲

Comment on lines +7 to +8
- implementation 'com.github.Dimezis:BlurView:version-2.0.3'
+ implementation 'com.github.Dimezis:BlurView:version-2.0.4'
Copy link
Member

Choose a reason for hiding this comment

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

This will not work, as the version of Node modules we use in gradle Nix shell is not patched:

# WARNING: Unpatched Node.js deps allow Gradle to use remote repos.
"$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${pkgs.deps.nodejs}
function restore_patched_modules() {
"$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${pkgs.deps.nodejs-patched}
}
trap restore_patched_modules EXIT

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, I've removed this block and it seems like the patched deps are fetched now.

Copy link
Member

Choose a reason for hiding this comment

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

One possibility is to split patching of nodejs derivation into two stages: nodejs-patched and nodejs-offline. That way we can use the patched version without using the version that modifies Gradle configs to not reference remote repositories.

Though at the same time, I kinda wonder if that second type of patching is still necessary.

@siddarthkay siddarthkay marked this pull request as ready for review August 21, 2024 04:23
@siddarthkay
Copy link
Contributor Author

This needs more work, converting to Draft

@siddarthkay siddarthkay marked this pull request as draft August 21, 2024 12:06
@jakubgs
Copy link
Member

jakubgs commented Sep 24, 2024

Are we abandoning the idea of 3-stage patched nodes? Or the multi-repo Gradle configs?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants