diff --git a/R/jdx/DESCRIPTION b/R/jdx/DESCRIPTION index 0c280f8..5e5af56 100644 --- a/R/jdx/DESCRIPTION +++ b/R/jdx/DESCRIPTION @@ -1,19 +1,17 @@ Package: jdx Type: Package -Title: Java Data Exchange for R and rJava -Version: 0.1.0 +Title: 'Java' Data Exchange for 'R' and 'rJava' +Description: Simplifies and extends data exchange between 'R' and 'Java'. +Version: 0.1.1 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")) -Author: Floid R. Gilbert [aut, cre], David B. Dahl [aut] -Maintainer: Floid R. Gilbert -Description: Simplifies and extends data exchange between R and Java. License: GPL (>= 2) | BSD_3_clause + file LICENSE Encoding: UTF-8 Imports: rJava (>= 0.9-8), utils (>= 3.3.0) -SystemRequirements: Java Runtime Environment (>= 1.8) +SystemRequirements: Java Runtime Environment (>= 8) RoxygenNote: 6.0.1 Suggests: testthat, knitr, rmarkdown, pander VignetteBuilder: knitr NeedsCompilation: no -Packaged: 2018-01-03 19:27:56 UTC; Floid +Packaged: 2018-01-18 20:52:00 UTC; Floid URL: https://github.com/floidgilbert/jdx BugReports: https://github.com/floidgilbert/jdx/issues diff --git a/R/jdx/NEWS b/R/jdx/NEWS new file mode 100644 index 0000000..6743d06 --- /dev/null +++ b/R/jdx/NEWS @@ -0,0 +1,17 @@ +// // // // // // // // // // // // // // // // // // // // // // // // // // +// // +// News for package jdx // +// // +// // // // // // // // // // // // // // // // // // // // // // // // // // + +* * * 2018-01-18 v 0.1.1 * * * + +- Changed Java version format in DESCRIPTION file. + +- 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. diff --git a/R/jdx/man/LowLevelInterface.Rd b/R/jdx/man/LowLevelInterface.Rd index fc6b160..4218a7c 100644 --- a/R/jdx/man/LowLevelInterface.Rd +++ b/R/jdx/man/LowLevelInterface.Rd @@ -10,7 +10,7 @@ Low-level Interface for jdx } \description{ -The functions listed here are the low-level interface for \CRANpkg{jdx} and are primarily used behind the scenes in \CRANpkg{jsr223}, the high-level integration package for Java. However, these functions may also be useful for \CRANpkg{rJava} developers interested in a thread-safe alternative to \code{\link{convertToR}}. See the code examples for a brief outline. If multi-threaded access is not required, please use \code{\link{convertToR}}. +The functions listed here are the low-level interface for \CRANpkg{jdx} and are primarily used behind the scenes in \pkg{jsr223}, the high-level integration package for Java. However, these functions may also be useful for \CRANpkg{rJava} developers interested in a thread-safe alternative to \code{\link{convertToR}}. See the code examples for a brief outline. If multi-threaded access is not required, please use \code{\link{convertToR}}. } \usage{ diff --git a/R/jdx/vignettes/Introduction.Rmd b/R/jdx/vignettes/Introduction.Rmd index 3cf0acc..ea4b0d1 100644 --- a/R/jdx/vignettes/Introduction.Rmd +++ b/R/jdx/vignettes/Introduction.Rmd @@ -32,7 +32,9 @@ For those familar with the technical details of rJava, here are two important no The jdx package requires Java 8 Standard Edition or above. The current version of the Java Runtime Environment (JRE) can be determined by executing `java -version` from a system command prompt. Java 8 is denoted by version 1.8.x_xx. The JRE can be obtained from [Oracle's web site](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html). Select the architecture (32 or 64 bit) that matches your R installation. -The jdx package runs on a standard installation of R (e.g., the R build option `--enable-R-shlib` is not required). Install jdx with the usual command: `install.packages("jdx")`. +The jdx package runs on a standard installation of R (e.g., the R build option `--enable-R-shlib` is not required). + +Install jdx with the usual command: `install.packages("jdx")`. This command will automatically download and install rJava if necessary. If the rJava installation fails, make sure R is configured to use Java. For Linux/OSX, use `sudo R CMD javareconf`. For Windows, open a command prompt "As Administrator" and execute `R CMD javareconf`. If there are errors after executing the command, address them, then execute the Java configuration command again. One common error can be resolved by determining whether the GNU Compiler Collection (GCC) is accessible. To check for GCC, execute `gcc --help` from a terminal. This command will fail if GCC is not installed or if the license agreement has not been accepted. ## Primary Functions diff --git a/R/jdx_0.1.0.tar.gz b/R/jdx_0.1.0.tar.gz deleted file mode 100644 index a676966..0000000 Binary files a/R/jdx_0.1.0.tar.gz and /dev/null differ diff --git a/R/jdx_0.1.1.tar.gz b/R/jdx_0.1.1.tar.gz new file mode 100644 index 0000000..1efd04d Binary files /dev/null and b/R/jdx_0.1.1.tar.gz differ diff --git a/java/org.fgilbert.jdx/.classpath b/java/org.fgilbert.jdx/.classpath index 3e0fb27..04cc82d 100644 --- a/java/org.fgilbert.jdx/.classpath +++ b/java/org.fgilbert.jdx/.classpath @@ -1,7 +1,7 @@ - + diff --git a/readme-release.txt b/readme-release.txt index 99d82d3..8219a40 100644 --- a/readme-release.txt +++ b/readme-release.txt @@ -38,5 +38,7 @@ 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` + - Update release notes/news.