cran

SymbolixAU · Jan 21, 2024 · 7e61430 · 7e61430
1 parent f431b6c
commit 7e61430
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 11 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -8,3 +8,4 @@
 ^codecov\.yml$
 ^docs/
 ^CRAN-SUBMISSION$
+^LICENSE\.md$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: spatialwidget
 Type: Package
 Title: Formats Spatial Data for Use in Htmlwidgets
 Version: 0.2.5
-Date: 2023-08-22
+Date: 2024-01-22
 Authors@R: c(
     person("David", "Cooley", ,"[email protected]", role = c("aut", "cre"))
     )
@@ -11,23 +11,22 @@ Description: Many packages use 'htmlwidgets' <https://CRAN.R-project.org/package
     This package provides functions for converting R objects, such as simple features, 
     into structures suitable for use in 'htmlwidgets' mapping libraries. 
 URL: https://symbolixau.github.io/spatialwidget/articles/spatialwidget.html
-License: GPL-3
+License: MIT + file LICENSE
 Depends: R (>= 3.3.0)
-SystemRequirements: C++11
 Encoding: UTF-8
 LazyData: true
 Imports:
     Rcpp
 LinkingTo: 
     BH (>= 1.81.0),
-    colourvalues (>= 0.3.6),
+    colourvalues (>= 0.3.9),
     geojsonsf (>= 1.3.3),
-    geometries (>= 0.2.1),
-    interleave (>= 0.1.1),
+    geometries (>= 0.2.4),
+    interleave (>= 0.1.2),
     jsonify (>= 1.1.1),
     rapidjsonr,
     Rcpp,
-    sfheaders (>= 0.4.1)
+    sfheaders (>= 0.4.4)
 RoxygenNote: 7.1.1
 Suggests:
     colourvalues,

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,2 @@
+YEAR: 2024
+COPYRIGHT HOLDER: spatialwidget authors
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2024 spatialwidget authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # v0.2.5
 
+* changed to MIT license
+* removed C++11 system requirements
 * Replaced `std::regex_match` in `is_hex()` due to crashes on Windows [issue 359](https://github.com/SymbolixAU/mapdeck/issues/359)
 
 # v0.2.4

diff --git a/src/Makevars b/src/Makevars
@@ -1,4 +1,2 @@
-CXX_STD = CXX11
-
 PKG_CXXFLAGS = -I../inst/include
 PKG_CPPFLAGS = -DSTRICT_R_HEADERS -DBOOST_NO_AUTO_PTR
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,4 +1,2 @@
-CXX_STD = CXX11
-
 PKG_CXXFLAGS = -I../inst/include
 PKG_CPPFLAGS = -DSTRICT_R_HEADERS -DBOOST_NO_AUTO_PTR
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		YEAR: 2024
		COPYRIGHT HOLDER: spatialwidget authors