jdx 0.1.2 release

floidgilbert · Jan 19, 2018 · 06e887f · 06e887f
1 parent ecce43f
commit 06e887f
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 12 deletions.
diff --git a/R/jdx/DESCRIPTION b/R/jdx/DESCRIPTION
@@ -2,7 +2,7 @@ Package: jdx
 Type: Package
 Title: 'Java' Data Exchange for 'R' and 'rJava'
 Description: Simplifies and extends data exchange between 'R' and 'Java'.
-Version: 0.1.1
+Version: 0.1.2
 Authors@R: c(person(given="Floid R.", family="Gilbert", role=c("aut","cre"), email="floid.r.gilbert@gmail.com"), person(given="David B.", family="Dahl", role=c("aut"), email="dahl@stat.byu.edu"))
 License: GPL (>= 2) | BSD_3_clause + file LICENSE
 Encoding: UTF-8

diff --git a/R/jdx/NEWS b/R/jdx/NEWS
@@ -4,14 +4,20 @@
 //                                                                         //
 // // // // // // // // // // // // // // // // // // // // // // // // // //
 
+
+* * * 2018-01-19 v 0.1.2 * * *
+
+  - Check for Java 8 during package initialization.
+
+
 * * * 2018-01-18 v 0.1.1 * * *
 
-- Changed Java version format in DESCRIPTION file.
+  - Changed Java version format in DESCRIPTION file.
 
-- Updated installation instructions to execute `R CMD javareconf` in the event 
-  rJava dependency fails to install properly.
+  - Updated installation instructions to execute `R CMD javareconf` in the event 
+    rJava dependency fails to install properly.
 
 
 * * * 2018-01-04 v 0.1.0 * * *
 
-- Initial release.
+  - Initial release.
diff --git a/R/jdx/R/InitializePackage.R b/R/jdx/R/InitializePackage.R
@@ -1,6 +1,12 @@
 .onLoad <- function(libname, pkgname) {
   rJava::.jpackage(pkgname, lib.loc = libname)
 
+  # Check Java version. 
+  # See https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Writing-portable-packages
+  v <- rJava::.jcall("java/lang/System", "S", "getProperty", "java.runtime.version")
+  v <- as.numeric(paste0(strsplit(v, "[.]")[[1L]][1:2], collapse = "."))
+  if(v < 1.8) stop("Java 8 is required for this package.")
+
   # Creating these objects via rJava is slow, so instantiate them only once and
   # re-use them to improve performance.
   assign("jdx.utility", rJava::.jnew("org/fgilbert/jdx/Utility"), inherits = TRUE)

diff --git a/R/jdx/inst/java/org.fgilbert.jdx-0.1.0.jar b/R/jdx/inst/java/org.fgilbert.jdx-0.1.0.jar
diff --git a/R/jdx/java/org.fgilbert.jdx-sources-0.1.0.jar b/R/jdx/java/org.fgilbert.jdx-sources-0.1.0.jar
diff --git a/R/jdx_0.1.1.tar.gz b/R/jdx_0.1.1.tar.gz
diff --git a/java/org.fgilbert.jdx/.classpath b/java/org.fgilbert.jdx/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/org.fgilbert.jdx/org.fgilbert.jdx-sources.jardesc b/java/org.fgilbert.jdx/org.fgilbert.jdx-sources.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="D:/Offline/Work/jdx/R/jdx/java/org.fgilbert.jdx-sources-0.1.0.jar"/>
+    <jar path="D:/Offline/Work/jdx/R/jdx/java/org.fgilbert.jdx-sources-0.1.2.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/org.fgilbert.jdx/org.fgilbert.jdx-sources.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

diff --git a/java/org.fgilbert.jdx/org.fgilbert.jdx.jardesc b/java/org.fgilbert.jdx/org.fgilbert.jdx.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="D:/Offline/Work/jdx/R/jdx/inst/java/org.fgilbert.jdx-0.1.0.jar"/>
+    <jar path="D:/Offline/Work/jdx/R/jdx/inst/java/org.fgilbert.jdx-0.1.2.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/org.fgilbert.jdx/org.fgilbert.jdx.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

diff --git a/readme-release.txt b/readme-release.txt
@@ -9,7 +9,8 @@ This document contains build and release instructions for jdx. Instructions are
 
 - Close all sessions using the package.
 
-- Uninstall jdx: `remove.packages("jdx")`. Sometimes the JAR files fail to update during build in RStudio.
+- Uninstall jdx: `detach("package:jdx", unload=TRUE); remove.packages("jdx")`
+  Sometimes the JAR files fail to update during build in RStudio.
 
 - In Java project...
 
@@ -25,7 +26,8 @@ This document contains build and release instructions for jdx. Instructions are
 --- Add roxygen @export* comments to any new exported functions/classes.
     The NAMESPACE file will automatically be updated when the project is rebuilt (if using RStudio and original Rproj file).
 
---- Update documentation (man files and vignettes). Use `devtools::install(build_vignettes = TRUE)` to preview vignette build in package.
+--- Update documentation (man files and vignettes). Use `devtools::install(build_vignettes = TRUE)` to preview vignette 
+    build in package.
     Test all links in the documentation.
 
 --- Change version numbers and dependencies in DESCRIPTION file.
@@ -38,7 +40,8 @@ This document contains build and release instructions for jdx. Instructions are
 
 --- Build R project source package.
 
---- Test source package package using `R CMD check --as-cran`
+--- Move source package into an empty directory and check it using `R CMD check --as-cran`
 
-- Update release notes/news.
+- Update release notes/news (R/jdx/NEWS).
 
+- Create release tag in GIT repository. https://github.com/floidgilbert/jdx/releases