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

Use an aar to define bridge dependency #3892

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Use an aar to define bridge dependency #3892

merged 3 commits into from
Sep 10, 2024

Conversation

ahaisting-livefront
Copy link
Collaborator

📔 Objective

The goal here is to fix the failing beta variants on main. When defining bridge as a project dependency, a variant for beta cannot be found. Including an .aar as the dependency resolves this issue.

📸 Screenshots

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

// TODO: this should use a versioned aar instead of referencing the project BITAU-94
implementation(project(":bridge"))
// TODO: this should use a versioned aar instead of referencing a local aar BITAU-94
implementation(files("libs/bridge-release.aar"))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we at least give this some kind of version or "snapshot" kind of name? Maybe 0.1.0-snapshot to make clear its not actually released?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yup, totally fair.

I'm going to look into including that automatically on the bridge build side. I'm assuming that's what you mean.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Just force pushed an update that adds the version to the output .aar to help reduce confusion until we can get a permanent solution.

Copy link
Contributor

github-actions bot commented Sep 10, 2024

Logo
Checkmarx One – Scan Summary & Details1c6ad2ce-e98f-4393-bcb0-3c7cf8a7b024

No New Or Fixed Issues Found

Copy link

codecov bot commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.61%. Comparing base (4e69ed5) to head (a02f475).
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3892   +/-   ##
=======================================
  Coverage   88.61%   88.61%           
=======================================
  Files         411      411           
  Lines       33768    33768           
  Branches     4988     4988           
=======================================
  Hits        29923    29923           
  Misses       2091     2091           
  Partials     1754     1754           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

	- Add build instructions to bridge README
bridge/README.md Outdated
@@ -16,6 +17,14 @@
- **Minimum SDK**: 28
- **Target SDK**: 34

## Building

To build an aar for inclusion in consumer applications, run:
Copy link
Collaborator

Choose a reason for hiding this comment

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

aar should be AAR anywhere we refer to it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Cool 👍

b650813

// TODO: this should use a versioned aar instead of referencing the project BITAU-94
implementation(project(":bridge"))
// TODO: this should use a versioned aar instead of referencing a local aar BITAU-94
implementation(files("libs/bridge-0.1.0-release.aar"))
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm still wondering if we should slap snapshot on here manually to make clear this isn't the released version of 0.1.0.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'll defer to you!

Our definition of released is pretty nebulous. If its built and included in the source of the Bitwarden app, isn't it released?

I'm happy either way.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I went ahead and added SNAPSHOT:

a02f475

@ahaisting-livefront
Copy link
Collaborator Author

Thanks for the comments, @brian-livefront !

@ahaisting-livefront ahaisting-livefront merged commit b94a1ad into main Sep 10, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants