Skip to content

Commit

Permalink
Update license & CRAN comments
Browse files Browse the repository at this point in the history
  • Loading branch information
hrbrmstr committed Mar 5, 2018
1 parent 018aca4 commit 88f9cc4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ URL: http://gitlab.com/hrbrmstr/ndjson
BugReports: https://gitlab.com/hrbrmstr/ndjson/issues
SystemRequirements: zlib, C++11
NeedsCompilation: yes
License: AGPL
License: MIT + file LICENSE
Encoding: UTF-8
Suggests:
testthat
Expand Down
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
YEAR: 2018
COPYRIGHT HOLDER: Bob Rudis
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.6.0
=====================
* License change to MIT
* Updated to nlohmann/json.hpp v3.1.1 (Ref:
<https://github.com/nlohmann/json/blob/develop/ChangeLog.md>)
* Removed nlohmann/json.hpp #pragma's causing CRAN issues vis-a-vis the new
Expand Down
1 change: 1 addition & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ None

## General notes

- License change to MIT
- Removed included-json library #pragmas causing CRAN issues due to new
"show all warnings" policy
- Update core C++ library the pkg uses to 3.1.1

0 comments on commit 88f9cc4

Please sign in to comment.