From 6cb5210793ffb43d330d1e1d26b17a784ad9c96b Mon Sep 17 00:00:00 2001
From: Raniere Silva <Raniere.CostadaSilva@gesis.org>
Date: Mon, 27 Jan 2025 09:50:33 +0100
Subject: [PATCH 1/4] Upgrade R to 4.4.2

Released on 2024-10-31.
---
 repo2docker/buildpacks/r.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/repo2docker/buildpacks/r.py b/repo2docker/buildpacks/r.py
index 0c5c6c43..35703162 100644
--- a/repo2docker/buildpacks/r.py
+++ b/repo2docker/buildpacks/r.py
@@ -69,9 +69,9 @@ class RBuildPack(PythonBuildPack):
         """
         # Available versions at https://cran.r-project.org/src/base/
         version_map = {
-            "4.4": "4.4.1",
+            "4.4": "4.4.2",
             "4.3": "4.3.3",
-            "4.2": "4.2.1",
+            "4.2": "4.2.3",
             "4.1": "4.1.3",
             "4.0": "4.0.5",
             "3.6": "3.6.3",
@@ -87,7 +87,7 @@ class RBuildPack(PythonBuildPack):
         #       - tests/unit/test_r.py -> test_version_specification
         #       - tests/r/r-rspm-apt/verify
         #
-        r_version = version_map["4.2"]
+        r_version = version_map["4.4"]
 
         if not hasattr(self, "_r_version"):
             parts = self.runtime.split("-")

From 80e561afb9f5e0a6f8b43a7dab914e5a157a336b Mon Sep 17 00:00:00 2001
From: Raniere Gaia Costa da Silva <Raniere.CostadaSilva@gesis.org>
Date: Mon, 18 Aug 2025 15:11:39 +0200
Subject: [PATCH 2/4] Fix test for default version of R

---
 tests/r/r-rspm-apt-file/verify.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/r/r-rspm-apt-file/verify.r b/tests/r/r-rspm-apt-file/verify.r
index 30117134..ca5b27d1 100755
--- a/tests/r/r-rspm-apt-file/verify.r
+++ b/tests/r/r-rspm-apt-file/verify.r
@@ -2,8 +2,8 @@
 library('digest')
 
 
-# Fail if version isn't 4.2, the default version for the RBuildPack
+# Fail if version isn't 4.4, the default version for the RBuildPack
 print(version)
-if (!(version$major == "4" && as.double(version$minor) >= 2 && as.double(version$minor) < 3)) {
+if (!(version$major == "4" && as.double(version$minor) >= 4 && as.double(version$minor) < 5)) {
   quit("yes", 1)
 }

From d83fd102bbb1a365f9d568dae0318bd8e8d6802c Mon Sep 17 00:00:00 2001
From: Raniere Gaia Costa da Silva <Raniere.CostadaSilva@gesis.org>
Date: Mon, 18 Aug 2025 15:12:55 +0200
Subject: [PATCH 3/4] Fix more test related with R version

---
 tests/unit/test_r.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/test_r.py b/tests/unit/test_r.py
index a7028d82..24c48609 100644
--- a/tests/unit/test_r.py
+++ b/tests/unit/test_r.py
@@ -8,7 +8,7 @@ from repo2docker import buildpacks
 
 
 @pytest.mark.parametrize(
-    "runtime_version, expected", [("", "4.2"), ("3.6", "3.6"), ("3.5.1", "3.5")]
+    "runtime_version, expected", [("", "4.4"), ("3.6", "3.6"), ("3.5.1", "3.5")]
 )
 def test_version_specification(tmpdir, runtime_version, expected, base_image):
     tmpdir.chdir()

From f2641f3edf91e5007881c0de8e0a4629f5e98e59 Mon Sep 17 00:00:00 2001
From: Raniere Gaia Costa da Silva <Raniere.CostadaSilva@gesis.org>
Date: Mon, 18 Aug 2025 17:23:03 +0200
Subject: [PATCH 4/4] Change the date used for the R snapshot

because the previous date was too old and didn't support the new version of R.
---
 tests/r/r-rspm-apt-file/runtime.txt         | 2 +-
 tests/r/r-rspm-description-file/DESCRIPTION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/r/r-rspm-apt-file/runtime.txt b/tests/r/r-rspm-apt-file/runtime.txt
index aa35fc0b..fac25eae 100644
--- a/tests/r/r-rspm-apt-file/runtime.txt
+++ b/tests/r/r-rspm-apt-file/runtime.txt
@@ -1 +1 @@
-r-2022-06-23
+r-2025-07-01
diff --git a/tests/r/r-rspm-description-file/DESCRIPTION b/tests/r/r-rspm-description-file/DESCRIPTION
index 2c51fc3c..a63e8d62 100644
--- a/tests/r/r-rspm-description-file/DESCRIPTION
+++ b/tests/r/r-rspm-description-file/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: binderdescription
 Version: 0.1
-Date: 2022-06-23
+Date: 2025-07-01
 Title: Binder R DESCRIPTION support
 Description: Test that automatically building R packages works
 Author: Bastian Greshake Tzovaras <bgreshake@googlemail.com>