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.

Sign up for GitHub

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

Jump to bottom

Allow more license Types #648

Open
wants to merge 13 commits into
base: development
Choose a base branch
from
Open

Allow more license Types #648

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
866ef41
Data: Support more license types
dimensionscape Aug 31, 2024
72479a4
Data: Apache?
dimensionscape Aug 31, 2024
cf736d1
schema.json: Support more license types
dimensionscape Aug 31, 2024
a297cb4
Data: More license types
dimensionscape Aug 31, 2024
7d969a9
Merge pull request #1 from Dimensionscape/patch-2
dimensionscape Aug 31, 2024
c674e6d
Merge pull request #2 from Dimensionscape/patch-1
dimensionscape Aug 31, 2024
6277e65
TestSubmit: Allow more licenses
dimensionscape Aug 31, 2024
91ce8d2
Data: Change "Other" license to Open-Source-Other
dimensionscape Sep 1, 2024
99c54be
schema.json: Change "Other" license to Open-Source-Other
dimensionscape Sep 1, 2024
67740ad
Data: Change "Other" license to Open-Source-Other
dimensionscape Sep 1, 2024
7866a01
Update TestSubmit.hx
dimensionscape Sep 1, 2024
f6277b6
Revert some changes
dimensionscape Sep 1, 2024
debd198
Dont need to change legacy
dimensionscape Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"license": {
"description": "Open source license under which the project is licensed",
"enum": ["GPL", "LGPL", "BSD", "Public", "MIT", "Apache"]
"enum": ["GPL", "LGPL", "BSD", "Public", "MIT", "Apache", "MPL"]
},
"version": { "$ref": "#/definitions/semver" },
"classPath": {
Expand Down
1 change: 1 addition & 0 deletions src/haxelib/Data.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ typedef DefineDocumentation = {
var Bsd = 'BSD';
var Public = 'Public';
var Apache = 'Apache';
var Mpl = 'MPL';
@:disallowed
var Unknown = 'Unknown';
}
Expand Down
2 changes: 1 addition & 1 deletion src/legacyhaxelib/Data.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Data {
public static var DOCXML = "haxedoc.xml";
public static var REPOSITORY = "files";
public static var alphanum = ~/^[A-Za-z0-9_.-]+$/;
static var LICENSES = ["GPL","LGPL","BSD","Public","MIT"];
static var LICENSES = ["GPL","LGPL","BSD","Public","MIT", "Apache", "MPL"];
dimensionscape marked this conversation as resolved.
Show resolved Hide resolved

static function requiredAttribute( x : Xml, name ) {
var v = x.get(name);
Expand Down
2 changes: 1 addition & 1 deletion test/tests/integration/TestSubmit.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class TestSubmit extends IntegrationTests {

final r = haxelib(["submit", Path.join([IntegrationTests.projectRoot, "test/libraries/libInvalidLicense.zip"]), bar.pw]).result();
assertFail(r);
assertEquals("Error: Invalid value `Unknown` for License. Allowed values: GPL, LGPL, MIT, BSD, Public, Apache", r.err.trim());
assertEquals("Error: Invalid value `Unknown` for License. Allowed values: GPL, LGPL, MIT, BSD, Public, Apache, MPL", r.err.trim());

final r = haxelib(["search", "Bar"]).result();
// did not get submitted
Expand Down