Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vpinna80/rJava
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: s-u/rJava
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
5 contributors
Loading
Showing with 5,904 additions and 4,045 deletions.
  1. +45 −0 .github/workflows/check.yaml
  2. +1 −0 .gitignore
  3. +2 −2 DESCRIPTION
  4. +217 −61 NEWS
  5. +8 −3 R/0classes.R
  6. +12 −7 R/J.R
  7. +6 −7 R/call.R
  8. +1 −0 R/jfirst.R
  9. +6 −0 R/jinit.R
  10. +57 −40 R/loader.R
  11. +57 −37 R/reflection.R
  12. +58 −8 README.md
  13. +1 −1 configure
  14. +13 −24 configure.ac
  15. +1 −1 configure.win
  16. +1 −0 jri/Makefile.all
  17. +1 −1 jri/REngine
  18. +2 −2 jri/RFactor.java
  19. +41 −41 jri/Rengine.java
  20. +1,617 −1,234 jri/configure
  21. +17 −10 jri/configure.ac
  22. +9 −1 jri/configure.win
  23. +17 −11 jri/src/Makefile.all
  24. +1 −1 jri/src/Makefile.in
  25. +67 −38 jri/src/Rcallbacks.c
  26. +10 −4 jri/src/Rcallbacks.h
  27. +26 −13 jri/src/Rinit.c
  28. +1 −1 jri/src/Rinit.h
  29. +39 −1 jri/src/config.h.in
  30. +4 −1 jri/src/jri.h
  31. +12 −13 jri/src/rjava.c
  32. +4 −5 jri/src/rjava.h
  33. +231 −0 jri/src/rjstring.c
  34. +25 −0 jri/src/rjstring.h
  35. +601 −473 jri/tools/config.guess
  36. +1,329 −1,267 jri/tools/config.sub
  37. BIN jri/tools/getsp.class
  38. +19 −0 jri/tools/getsp.java
  39. +218 −204 jri/tools/install-sh
  40. +127 −64 jri/tools/mkinstalldirs
  41. +3 −1 man/J.Rd
  42. +5 −5 man/accessOp.Rd
  43. +4 −4 man/jarray.Rd
  44. +1 −1 man/javaImport.Rd
  45. +11 −11 man/jcall.Rd
  46. +3 −3 man/jcastToArray.Rd
  47. +4 −4 man/jcheck.Rd
  48. +2 −2 man/jfield.Rd
  49. +16 −7 man/jfloat.Rd
  50. +31 −1 man/jinit.Rd
  51. +2 −2 man/jmemprof.Rd
  52. +3 −3 man/jnew.Rd
  53. +3 −3 man/jnull.Rd
  54. +41 −3 man/jpackage.Rd
  55. +14 −14 man/jrectRef-class.Rd
  56. +8 −6 man/jreflection.Rd
  57. +1 −1 man/jserialize.Rd
  58. +39 −10 man/loader.Rd
  59. +80 −0 man/rJava-internal.Rd
  60. +1 −1 man/toJava.Rd
  61. +1 −1 man/with.Rd
  62. +4 −3 mkdist
  63. +87 −46 src/Rglue.c
  64. +8 −2 src/callJNI.c
  65. +98 −81 src/fields.c
  66. +73 −53 src/init.c
  67. +3 −1 src/java/DummyPoint.java
  68. +1 −0 src/java/RJavaArrayIterator.java
  69. +28 −16 src/java/RJavaArrayTools.java
  70. +4 −4 src/java/RJavaArrayTools_Test.java
  71. +19 −7 src/java/RJavaClassLoader.java
  72. +2 −2 src/java/RJavaComparator.java
  73. +19 −5 src/java/RJavaTools.java
  74. +2 −1 src/java/RJavaTools_Test.java
  75. +3 −5 src/jri_glue.c
  76. +1 −1 src/loader.c
  77. +55 −56 src/otables.c
  78. +29 −84 src/rJava.c
  79. +21 −9 src/rJava.h
  80. +1 −1 src/registration.c
  81. +231 −0 src/rjstring.c
  82. +25 −0 src/rjstring.h
  83. +6 −4 src/tools.c
  84. BIN tests/old/Leaks.class
  85. BIN tests/old/Types.class
  86. +7 −5 tests/old/leaks.R
45 changes: 45 additions & 0 deletions .github/workflows/check.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
on: [push, pull_request]

name: check

jobs:
check:
runs-on: ${{ matrix.os }}
env:
NOAWT: 1

name: ${{ matrix.os }}, R ${{ matrix.r }}, Java ${{ matrix.java }}

strategy:
fail-fast: false
matrix:
os: [ 'windows-2022', 'macOS-13', 'macOS-14', 'ubuntu-22.04' ]
r: [ 'release' ]
java: [ 8, 11 ]

steps:
- uses: actions/checkout@v4

- name: Install R
uses: s-u/R-actions/install@v2
with:
r-version: ${{ matrix.r }}
tools: base

- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}

- name: Setup R Java support
if: runner.os != 'Windows'
run: |
echo export PATH=$PATH > reconf.sh
echo export JAVA_HOME=$JAVA_HOME >> reconf.sh
echo R CMD javareconf >> reconf.sh
sudo bash reconf.sh
shell: bash

- uses: s-u/R-actions/pkg-check@v2
with:
build-script: sh mkdist
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*~
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ Version: (populated by mkdist!)
Title: Low-Level R to Java Interface
Author: Simon Urbanek <simon.urbanek@r-project.org>
Maintainer: Simon Urbanek <simon.urbanek@r-project.org>
Depends: R (>= 2.5.0), methods
Depends: R (>= 3.6.0), methods
Description: Low-level interface to Java VM very much like .C/.Call and friends. Allows creation of objects, calling methods and accessing fields.
License: GPL-2
License: LGPL-2.1
URL: http://www.rforge.net/rJava/
SystemRequirements: Java JDK 1.2 or higher (for JRI/REngine JDK 1.4 or higher), GNU make
BugReports: https://github.com/s-u/rJava/issues
Loading