From 4761621f344365ead733221a91187ae12eb517b8 Mon Sep 17 00:00:00 2001 From: Marcus Saraiva Date: Sun, 20 Oct 2024 12:26:31 -0300 Subject: [PATCH] update R5 version to 7.2.0 and add metadata; configure Java build settings --- java-r5rcore/.vscode/settings.json | 3 +++ r-package/R/onLoad.R | 4 ++-- r-package/inst/extdata/metadata_r5r.csv | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 java-r5rcore/.vscode/settings.json diff --git a/java-r5rcore/.vscode/settings.json b/java-r5rcore/.vscode/settings.json new file mode 100644 index 00000000..c5f3f6b9 --- /dev/null +++ b/java-r5rcore/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/r-package/R/onLoad.R b/r-package/R/onLoad.R index 2bf33e3b..5df0cee6 100644 --- a/r-package/R/onLoad.R +++ b/r-package/R/onLoad.R @@ -15,8 +15,8 @@ r5r_env <- new.env(parent = emptyenv()) .onLoad <- function(lib, pkg) { # JAR version - r5r_env$r5_jar_version <- "7.1.0" - r5r_env$r5_jar_size <- 63494047 + r5r_env$r5_jar_version <- "7.2.0" + r5r_env$r5_jar_size <- 63602630 # create dir to store R5 Jar cache_d <- paste0('r5r/r5_jar_v', r5r_env$r5_jar_version) diff --git a/r-package/inst/extdata/metadata_r5r.csv b/r-package/inst/extdata/metadata_r5r.csv index dcb6d7ba..819ade84 100644 --- a/r-package/inst/extdata/metadata_r5r.csv +++ b/r-package/inst/extdata/metadata_r5r.csv @@ -25,3 +25,4 @@ version;release_date;download_path 6.9.0;20230305;https://github.com/conveyal/r5/releases/download/v6.9/r5-v6.9-all.jar 7.0.0;20231203;https://github.com/conveyal/r5/releases/download/v7.0/r5-v7.0-all.jar 7.1.0;20240104;https://github.com/conveyal/r5/releases/download/v7.1/r5-v7.1-all.jar +7.2.0;20241020;https://github.com/conveyal/r5/releases/download/v7.2/r5-v7.2-all.jar