feat: re-add licenses by SPDX identifier, mark shorthand aliases as deprecated #1560
Conversation
edward-ly
requested review from
AndyScherzinger,
bigcat88 and
oleksandr-nc
and removed request for
bigcat88
…eprecated Signed-off-by: Edward Ly <[email protected]>
edward-ly
force-pushed
the
feat/spdx-licenses
branch
from
1218fb5 to
deadf1d
Compare
|
Besides my comments this looks good to me, yet this can only be merged after the same PR has been merged on server v31.0.0, to ensure v31.0.0 (and later) won't break. |
This will probably be done by me. CI is expected to fail, it is broken due to invalid translations. I have informed @nickvergessen about this situation, for now I will temporarily remove the translations from the repository (but they will be returned by the bot again soon) Edited: CI should be fixed now, thanks to Joas! |
| * must contain one of the following licenses (see the `SPDX License List <https://spdx.org/licenses/>`_ for details): | ||
|
|
||
| * **AGPL-3.0-only** | ||
| * **AGPL-3.0-or-later** | ||
| * **Apache-2.0** | ||
| * **GPL-3.0-only** | ||
| * **GPL-3.0-or-later** | ||
| * **MIT** | ||
| * **MPL-2.0** | ||
|
|
||
| * (deprecated) the following shorthand aliases are also used: | ||
|
|
||
| * **agpl** (AGPL-3.0) | ||
| * **apache** (Apache-2.0) | ||
| * **gpl3** (GPL-3.0) | ||
| * **mit** (MIT) | ||
| * **mpl** (MPL-2.0) |
There was a problem hiding this comment.
https://github.com/nextcloud/documentation/blob/master/developer_manual/app_development/info.rst this page must also be updated
…ecated. matching the app store change at nextcloud/appstore#1560 Signed-off-by: Andy Scherzinger <[email protected]>
Signed-off-by: Edward Ly <[email protected]>
|
Andy's suggestions have now been applied. By the way, with the new license IDs, I've been thinking maybe we need to change the way the license is displayed in the server as well (e.g. here), but I'll leave it up to you whether anything needs to be done about it or not. |
edward-ly
force-pushed
the
feat/spdx-licenses
branch
from
50754b2 to
e98fe07
Compare
I had a similar thought if we should just drop the "-licensed" in the rendering |
Signed-off-by: Edward Ly <[email protected]>
Signed-off-by: Edward Ly <[email protected]>
edward-ly
force-pushed
the
feat/spdx-licenses
branch
from
e98fe07 to
3560d00
Compare
Resolves #1274.
Adds the SPDX identifiers for the currently supported licenses as valid enum values for the
<licence>tag. Automatically convertsapache,mit, andmpltoApache-2.0,MIT, andMPL-2.0, respectively, when importing or creating a new app release.agplandgpl3are left alone for now as they are implicitly assumed to map toAGPL-3.0andGPL-3.0, but those identifiers are also deprecated themselves.Feel free to correct me if I'm wrong, but that was my interpretation based on the discussion so far.
Tasks for the app store admin (who I believe is @Altahrim?) after merging:
Licensestable: