Skip to content

Commit ffd26f2

Browse files
Re-license under MIT (#412)
* Update LICENSE * `devtools::document()` (GitHub Actions) * Update DESCRIPTION file * `devtools::document()` (GitHub Actions) * Update the license for the font * use usethis for updating license * `devtools::document()` (GitHub Actions) * chore: update email addresses --------- Co-authored-by: Garrick Aden-Buie <[email protected]>
1 parent dc800f3 commit ffd26f2

File tree

8 files changed

+163
-130
lines changed

8 files changed

+163
-130
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
^\.travis\.yml$
77
^appveyor\.yml$
88
^\.github$
9+
^LICENSE\.md$

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Package: shinydashboard
22
Title: Create Dashboards with 'Shiny'
33
Version: 0.7.2.9000
44
Authors@R: c(
5-
person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
6-
person("Barbara", "Borges Ribeiro", role = "aut", email = "[email protected]"),
7-
person(family = "RStudio", role = "cph"),
5+
person("Winston", "Chang", role = c("aut", "cre"), email = "winston@posit.co"),
6+
person("Barbara", "Borges Ribeiro", role = "aut"),
7+
person(family = "Posit Software, PBC", role = "cph"),
88
person(family = "Almasaeed Studio", role = c("ctb", "cph"), comment = "AdminLTE theme for Bootstrap"),
99
person(family = "Adobe Systems Incorporated", role = c("ctb", "cph"), comment = "Source Sans Pro font")
1010
)
@@ -13,7 +13,7 @@ Description: Create dashboards with 'Shiny'. This package provides
1313
URL: http://rstudio.github.io/shinydashboard/
1414
Depends:
1515
R (>= 3.0)
16-
License: GPL (>= 2) | file LICENSE
16+
License: MIT + file LICENSE
1717
Imports:
1818
utils,
1919
shiny (>= 1.0.0),

LICENSE

Lines changed: 2 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,2 @@
1-
The shinydashboard package as a whole is distributed under Version 2 of the GPL
2-
or any later version.
3-
4-
The shinydashboard package inludes other GPL-2 and GPL-3 compatible software
5-
components. The following is a list of these components (full copies of the
6-
license agreements used by these components are included below):
7-
8-
- AdminLTE, https://github.com/almasaeed2010/AdminLTE
9-
- Google Web Fonts, https://www.google.com/fonts/attribution
10-
11-
12-
AdminLTE
13-
----------------------------------------------------------------------
14-
15-
The MIT License (MIT)
16-
17-
Copyright (c) 2013 almasaeed2010
18-
19-
Permission is hereby granted, free of charge, to any person obtaining a copy of
20-
this software and associated documentation files (the "Software"), to deal in
21-
the Software without restriction, including without limitation the rights to
22-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
23-
the Software, and to permit persons to whom the Software is furnished to do so,
24-
subject to the following conditions:
25-
26-
The above copyright notice and this permission notice shall be included in all
27-
copies or substantial portions of the Software.
28-
29-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
31-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
32-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
33-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
34-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35-
36-
37-
Source Sans Pro Font
38-
----------------------------------------------------------------------
39-
40-
SIL OPEN FONT LICENSE
41-
42-
Version 1.1 - 26 February 2007
43-
44-
PREAMBLE
45-
The goals of the Open Font License (OFL) are to stimulate worldwide
46-
development of collaborative font projects, to support the font creation
47-
efforts of academic and linguistic communities, and to provide a free and
48-
open framework in which fonts may be shared and improved in partnership
49-
with others.
50-
51-
The OFL allows the licensed fonts to be used, studied, modified and
52-
redistributed freely as long as they are not sold by themselves. The
53-
fonts, including any derivative works, can be bundled, embedded,
54-
redistributed and/or sold with any software provided that any reserved
55-
names are not used by derivative works. The fonts and derivatives,
56-
however, cannot be released under any other type of license. The
57-
requirement for fonts to remain under this license does not apply
58-
to any document created using the fonts or their derivatives.
59-
60-
DEFINITIONS
61-
"Font Software" refers to the set of files released by the Copyright
62-
Holder(s) under this license and clearly marked as such. This may
63-
include source files, build scripts and documentation.
64-
65-
"Reserved Font Name" refers to any names specified as such after the
66-
copyright statement(s).
67-
68-
"Original Version" refers to the collection of Font Software components as
69-
distributed by the Copyright Holder(s).
70-
71-
"Modified Version" refers to any derivative made by adding to, deleting,
72-
or substituting — in part or in whole — any of the components of the
73-
Original Version, by changing formats or by porting the Font Software to a
74-
new environment.
75-
76-
"Author" refers to any designer, engineer, programmer, technical
77-
writer or other person who contributed to the Font Software.
78-
79-
PERMISSION & CONDITIONS
80-
Permission is hereby granted, free of charge, to any person obtaining
81-
a copy of the Font Software, to use, study, copy, merge, embed, modify,
82-
redistribute, and sell modified and unmodified copies of the Font
83-
Software, subject to the following conditions:
84-
85-
1) Neither the Font Software nor any of its individual components,
86-
in Original or Modified Versions, may be sold by itself.
87-
88-
2) Original or Modified Versions of the Font Software may be bundled,
89-
redistributed and/or sold with any software, provided that each copy
90-
contains the above copyright notice and this license. These can be
91-
included either as stand-alone text files, human-readable headers or
92-
in the appropriate machine-readable metadata fields within text or
93-
binary files as long as those fields can be easily viewed by the user.
94-
95-
3) No Modified Version of the Font Software may use the Reserved Font
96-
Name(s) unless explicit written permission is granted by the corresponding
97-
Copyright Holder. This restriction only applies to the primary font name as
98-
presented to the users.
99-
100-
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
101-
Software shall not be used to promote, endorse or advertise any
102-
Modified Version, except to acknowledge the contribution(s) of the
103-
Copyright Holder(s) and the Author(s) or with their explicit written
104-
permission.
105-
106-
5) The Font Software, modified or unmodified, in part or in whole,
107-
must be distributed entirely under this license, and must not be
108-
distributed under any other license. The requirement for fonts to
109-
remain under this license does not apply to any document created
110-
using the Font Software.
111-
112-
TERMINATION
113-
This license becomes null and void if any of the above conditions are
114-
not met.
115-
116-
DISCLAIMER
117-
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
118-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
119-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
120-
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
121-
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
122-
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
123-
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
124-
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
125-
OTHER DEALINGS IN THE FONT SOFTWARE.
1+
YEAR: 2025
2+
COPYRIGHT HOLDER: shinydashboard authors

LICENSE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# MIT License
2+
3+
Copyright (c) 2025 shinydashboard authors
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

LICENSE.note

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
This package includes bundled software components covered by the following licenses:
2+
3+
----------------------------------------------------------------------
4+
5+
Component: AdminLTE (located in inst/AdminLTE/)
6+
Source: https://github.com/almasaeed2010/AdminLTE
7+
License: MIT License
8+
Copyright: (c) 2013 almasaeed2010
9+
10+
Full license text available in inst/AdminLTE/LICENSE.txt
11+
12+
----------------------------------------------------------------------
13+
14+
Component: Source Sans Pro Font (located in inst/AdminLTE/fonts/)
15+
Source: https://github.com/adobe-fonts/source-sans-pro
16+
License: SIL Open Font License (OFL) Version 1.1
17+
Copyright: (c) 2010-2024 Adobe
18+
19+
Full license text available in inst/AdminLTE/fonts/LICENSE.txt
20+
21+
----------------------------------------------------------------------

inst/AdminLTE/LICENSE.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014-2023 ColorlibHQ
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
this software and associated documentation files (the "Software"), to deal in
7+
the Software without restriction, including without limitation the rights to
8+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software is furnished to do so,
10+
subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

inst/AdminLTE/fonts/LICENSE.txt

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2010-2024 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
5+
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

man/shinydashboard-package.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)