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

Dual licensing: AGPL + Element Commercial #4118

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Conversation

bmarty
Copy link
Member

@bmarty bmarty commented Jan 7, 2025

Content

This PR mimics what has been done on element-hq/element-x-ios#3657.

Could be review commit per commit, for the big commit, this is 2 replace all, so I guess it can just be ignored...

Motivation and context

Make it clear that the code is dual licensed.

Screenshots / GIFs

There should be no impact on any code.

Tests

  • NA

Tested devices

  • NA

Checklist

  • Changes have been tested on an Android device or Android emulator with API 24
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • You've made a self review of your PR

bmarty added 4 commits January 7, 2025 09:59
2 replace all actions have been performed:
- "SPDX-License-Identifier: AGPL-3.0-only" to "SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial"
- "Please see LICENSE in the repository root for full details." to "Please see LICENSE files in the repository root for full details."
@bmarty bmarty requested a review from a team as a code owner January 7, 2025 09:12
@bmarty bmarty requested review from ganfra and removed request for a team January 7, 2025 09:12
@bmarty bmarty added the PR-Misc For other changes label Jan 7, 2025
Copy link
Contributor

github-actions bot commented Jan 7, 2025

📱 Scan the QR code below to install the build (arm64 only) for this PR.
QR code
If you can't scan the QR code you can install the build via this link: https://i.diawi.com/a2NCkc

Copy link

sonarqubecloud bot commented Jan 7, 2025

Copy link

codecov bot commented Jan 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.28%. Comparing base (a33266c) to head (2b9594e).
Report is 5 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #4118   +/-   ##
========================================
  Coverage    83.28%   83.28%           
========================================
  Files         1885     1885           
  Lines        49098    49098           
  Branches      5764     5764           
========================================
  Hits         40890    40890           
  Misses        6139     6139           
  Partials      2069     2069           

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

Copy link
Member

@ganfra ganfra left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

@bmarty bmarty merged commit 875963e into develop Jan 7, 2025
30 checks passed
@bmarty bmarty deleted the feature/bma/updateLicense branch January 7, 2025 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Misc For other changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants