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

fix(native-app): Android build fixes #17211

Merged
merged 9 commits into from
Dec 12, 2024
Merged

fix(native-app): Android build fixes #17211

merged 9 commits into from
Dec 12, 2024

Conversation

thoreyjona
Copy link
Contributor

@thoreyjona thoreyjona commented Dec 11, 2024

What

  • Fixing imports that needed to reference the root node_modules instead of app.
  • Updating reanimated to fix error in that.
  • Remove react-native-clipboard from settings.gradle since it was causing errors and when removing everything still works as it is supposed to work.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

Summary by CodeRabbit

  • New Features

    • Updated paths for React Native dependencies in the Android build configuration.
    • Removed the react-native-clipboard module from the project configuration.
  • Bug Fixes

    • Updated version of react-native-reanimated dependency.
  • Chores

    • Modified Firebase credentials for the development workflow in Codemagic configuration.

@thoreyjona thoreyjona requested review from a team as code owners December 11, 2024 15:44
Copy link
Contributor

coderabbitai bot commented Dec 11, 2024

Walkthrough

The changes in this pull request involve modifications to several configuration files for an Android application. Key updates include adjustments to directory paths in the build.gradle files to reflect a deeper project structure, the removal of the react-native-clipboard module in settings.gradle, an update to the react-native-reanimated dependency version in package.json, and a change in Firebase credentials for the dev-app-android workflow in codemagic.yaml. These updates maintain the overall structure and functionality of the project.

Changes

File Change Summary
apps/native/app/android/app/build.gradle Updated paths for reactNativeDir, codegenDir, and cliFile to deeper directory structure.
apps/native/app/android/build.gradle Modified repository URLs for React Native and JSC Android dependencies to a deeper relative path.
apps/native/app/android/settings.gradle Removed react-native-clipboard module and updated path for React Native Gradle plugin inclusion.
apps/native/app/package.json Updated react-native-reanimated dependency version from 3.12.1 to 3.16.5.
codemagic.yaml Changed firebase_credentials to firebase_credentials_dev in dev-app-android workflow.

Possibly related PRs

Suggested labels

automerge

Suggested reviewers

  • snaerseljan

📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 816d552 and e8754ff.

📒 Files selected for processing (1)
  • apps/native/app/android/app/build.gradle (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • apps/native/app/android/app/build.gradle

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Experiment)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (2)
apps/native/app/android/settings.gradle (1)

Path references to node_modules are inconsistent across Gradle files

The verification revealed inconsistencies in the path depth when referencing node_modules:

  • settings.gradle uses 4 levels: ../../../../node_modules/
  • build.gradle uses 5 levels: ../../../../../node_modules/
  • app/build.gradle mixes both 4 and 5 levels in comments and active code

These inconsistencies should be normalized to ensure reliable builds.

🔗 Analysis chain

Line range hint 3-3: Verify path consistency across the project

The paths have been updated to reference the root node_modules:

  • Native modules gradle script: ../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle
  • Gradle plugin: ../../../../node_modules/@react-native/gradle-plugin

These changes align with the PR objective to fix incorrect node_modules references.

Also applies to: 10-10

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Verify that no other files still reference the app's node_modules
rg -g '*.gradle' -g '*.properties' '../node_modules' apps/native/app/android/

Length of output: 1856

codemagic.yaml (1)

222-222: Consider documenting credential groups.

To help other developers understand the CI/CD setup, consider adding documentation that explains:

  • The purpose of different credential groups
  • How to set them up in Codemagic
  • Which environments use which credentials

Would you like me to help create a documentation template for the credential groups?

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 5c8c1b9 and 816d552.

⛔ Files ignored due to path filters (1)
  • yarn.lock is excluded by !**/yarn.lock, !**/*.lock
📒 Files selected for processing (5)
  • apps/native/app/android/app/build.gradle (2 hunks)
  • apps/native/app/android/build.gradle (1 hunks)
  • apps/native/app/android/settings.gradle (1 hunks)
  • apps/native/app/package.json (1 hunks)
  • codemagic.yaml (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • apps/native/app/package.json
🧰 Additional context used
📓 Path-based instructions (3)
apps/native/app/android/build.gradle (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/native/app/android/app/build.gradle (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/native/app/android/settings.gradle (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
🔇 Additional comments (4)
apps/native/app/android/settings.gradle (1)

6-7: Verify clipboard functionality after module removal

The removal of react-native-clipboard module might affect clipboard operations in the app.

apps/native/app/android/build.gradle (1)

36-36: Path updates align with node_modules restructuring

The repository URLs have been correctly updated to reference the root node_modules:

  • React Native: $rootDir/../../../../../node_modules/react-native/android
  • JSC Android: $rootDir/../../../../../node_modules/jsc-android/dist

These changes maintain consistency with the updated project structure.

Also applies to: 40-40

apps/native/app/android/app/build.gradle (1)

20-24: Path updates align with node_modules restructuring

The React Native configuration paths have been correctly updated to reference the root node_modules:

  • reactNativeDir: ../../../../../node_modules/react-native
  • codegenDir: ../../../../../node_modules/@react-native/codegen
  • cliFile: ../../../../../node_modules/react-native/cli.js

These changes maintain consistency with the updated project structure.

codemagic.yaml (1)

222-222: LGTM! Please verify the credential group exists.

The change from firebase_credentials to firebase_credentials_dev improves environment isolation between prod and dev builds. However, please ensure that:

  1. The firebase_credentials_dev group exists in Codemagic
  2. The group contains the correct Firebase configuration for the dev environment

apps/native/app/android/app/build.gradle Outdated Show resolved Hide resolved
Copy link
Member

@eirikurn eirikurn left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@thoreyjona thoreyjona added the automerge Merge this PR as soon as all checks pass label Dec 11, 2024
Copy link

codecov bot commented Dec 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 35.76%. Comparing base (32a256e) to head (e1d736b).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17211      +/-   ##
==========================================
- Coverage   35.76%   35.76%   -0.01%     
==========================================
  Files        6931     6931              
  Lines      147977   147977              
  Branches    42173    42173              
==========================================
- Hits        52931    52930       -1     
- Misses      95046    95047       +1     
Flag Coverage Δ
air-discount-scheme-backend 48.20% <ø> (ø)
air-discount-scheme-web 0.00% <ø> (ø)
api 3.33% <ø> (ø)
api-catalogue-services 75.81% <ø> (ø)
api-domains-air-discount-scheme 37.90% <ø> (ø)
api-domains-assets 26.71% <ø> (ø)
api-domains-auth-admin 48.49% <ø> (ø)
api-domains-communications 39.42% <ø> (ø)
api-domains-criminal-record 47.92% <ø> (ø)
api-domains-driving-license 44.81% <ø> (ø)
api-domains-education 31.22% <ø> (ø)
api-domains-health-insurance 35.33% <ø> (ø)
api-domains-mortgage-certificate 35.16% <ø> (ø)
api-domains-payment-schedule 42.04% <ø> (ø)
application-api-files 61.73% <ø> (ø)
application-core 76.01% <ø> (ø)
application-system-api 38.76% <ø> (+0.01%) ⬆️
application-template-api-modules 27.80% <ø> (+<0.01%) ⬆️
application-templates-accident-notification 28.93% <ø> (ø)
application-templates-car-recycling 3.12% <ø> (ø)
application-templates-criminal-record 25.78% <ø> (ø)
application-templates-driving-license 18.12% <ø> (ø)
application-templates-estate 13.79% <ø> (ø)
application-templates-example-payment 24.71% <ø> (ø)
application-templates-financial-aid 14.42% <ø> (ø)
application-templates-general-petition 23.13% <ø> (ø)
application-templates-inheritance-report 6.54% <ø> (ø)
application-templates-marriage-conditions 15.11% <ø> (ø)
application-templates-mortgage-certificate 43.56% <ø> (ø)
application-templates-parental-leave 29.95% <ø> (ø)
application-types 6.57% <ø> (ø)
application-ui-components 1.24% <ø> (ø)
application-ui-shell 22.47% <ø> (ø)
auth-admin-web 2.43% <ø> (ø)
auth-nest-tools 31.52% <ø> (ø)
auth-shared 75.00% <ø> (ø)
clients-charge-fjs-v2 28.35% <ø> (ø)
clients-driving-license 40.79% <ø> (ø)
clients-driving-license-book 43.83% <ø> (ø)
clients-financial-statements-inao 49.59% <ø> (ø)
clients-license-client 1.26% <ø> (ø)
clients-middlewares 72.89% <ø> (-0.33%) ⬇️
clients-regulations 42.87% <ø> (ø)
clients-rsk-company-registry 31.04% <ø> (ø)
clients-rsk-personal-tax-return 38.32% <ø> (ø)
clients-smartsolutions 12.77% <ø> (ø)
clients-syslumenn 49.41% <ø> (ø)
clients-zendesk 50.46% <ø> (ø)
cms 0.40% <ø> (ø)
cms-translations 38.76% <ø> (ø)
content-search-index-manager 95.65% <ø> (ø)
content-search-toolkit 8.20% <ø> (ø)
contentful-apps 4.72% <ø> (ø)
dokobit-signing 62.10% <ø> (ø)
email-service 60.07% <ø> (ø)
feature-flags 90.76% <ø> (ø)
file-storage 45.86% <ø> (ø)
financial-aid-backend 51.40% <ø> (ø)
financial-aid-shared 17.88% <ø> (ø)
icelandic-names-registry-backend 54.33% <ø> (ø)
infra-nest-server 48.06% <ø> (ø)
infra-tracing 69.63% <ø> (ø)
island-ui-core 30.92% <ø> (ø)
judicial-system-api 20.16% <ø> (ø)
judicial-system-audit-trail 68.94% <ø> (ø)
judicial-system-backend 55.87% <ø> (ø)
judicial-system-formatters 78.28% <ø> (ø)
judicial-system-message 66.47% <ø> (ø)
judicial-system-message-handler 48.23% <ø> (ø)
judicial-system-scheduler 70.97% <ø> (ø)
judicial-system-types 42.22% <ø> (ø)
judicial-system-web 27.89% <ø> (ø)
license-api 42.91% <ø> (-0.06%) ⬇️
localization 10.15% <ø> (ø)
logging 58.02% <ø> (ø)
message-queue 67.76% <ø> (ø)
nest-audit 65.78% <ø> (ø)
nest-aws 51.93% <ø> (ø)
nest-config 76.38% <ø> (ø)
nest-core 53.16% <ø> (ø)
nest-feature-flags 51.00% <ø> (ø)
nest-problem 45.64% <ø> (ø)
nest-sequelize 94.44% <ø> (ø)
nest-swagger 51.13% <ø> (ø)
nova-sms 61.42% <ø> (ø)
portals-admin-regulations-admin 1.80% <ø> (ø)
portals-core 19.83% <ø> (ø)
regulations 16.78% <ø> (ø)
residence-history 85.00% <ø> (ø)
services-auth-admin-api 52.55% <ø> (ø)
services-auth-delegation-api 58.53% <ø> (ø)
services-auth-ids-api 52.52% <ø> (-0.02%) ⬇️
services-auth-public-api 49.40% <ø> (ø)
services-sessions 65.35% <ø> (+0.04%) ⬆️
services-university-gateway 49.59% <ø> (+0.20%) ⬆️
services-user-notification 46.58% <ø> (ø)
services-user-profile 56.98% <ø> (ø)
shared-components 30.06% <ø> (ø)
shared-form-fields 33.88% <ø> (ø)
shared-mocking 58.64% <ø> (ø)
shared-pii 92.85% <ø> (ø)
shared-problem 87.50% <ø> (ø)
shared-utils 27.69% <ø> (ø)
skilavottord-ws 24.31% <ø> (ø)
web 2.43% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 32a256e...e1d736b. Read the comment docs.

@datadog-island-is
Copy link

Datadog Report

All test runs 443a453 🔗

98 Total Test Services: 0 Failed, 90 Passed
🔻 Test Sessions change in coverage: 1 decreased (-0.04%), 1 increased (+0.02%), 198 no change

Test Services
This report shows up to 10 services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Code Coverage Change Test Service View
air-discount-scheme-backend 0 0 0 63 0 23.78s N/A Link
air-discount-scheme-web 0 0 0 2 0 7.62s N/A Link
api 0 0 0 4 0 3.19s N/A Link
api-catalogue-services 0 0 0 23 0 12.94s N/A Link
api-domains-air-discount-scheme 0 0 0 6 0 22.41s N/A Link
api-domains-assets 0 0 0 3 0 13.83s 1 no change Link
api-domains-auth-admin 0 0 0 18 0 15.09s 1 no change Link
api-domains-communications 0 0 0 5 0 33.87s N/A Link
api-domains-criminal-record 0 0 0 5 0 9.74s 1 no change Link
api-domains-driving-license 0 0 0 23 0 35.86s N/A Link

🔻 Code Coverage Decreases vs Default Branch (1)

  • services-auth-delegation-api - jest 50.43% (-0.04%) - Details

@kodiakhq kodiakhq bot merged commit 37fe92b into main Dec 12, 2024
266 checks passed
@kodiakhq kodiakhq bot deleted the fix/android-build branch December 12, 2024 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants