Skip to content

Commit

Permalink
Update minimum supported R version to 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jgutman committed Mar 11, 2022
1 parent acac28d commit bf9b146
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions CMakeGlobals.txt
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ endif()

# required R version
set(RSTUDIO_R_MAJOR_VERSION_REQUIRED 3)
set(RSTUDIO_R_MINOR_VERSION_REQUIRED 0)
set(RSTUDIO_R_PATCH_VERSION_REQUIRED 1)
set(RSTUDIO_R_MINOR_VERSION_REQUIRED 3)
set(RSTUDIO_R_PATCH_VERSION_REQUIRED 0)

# allow opting out of version checking (for building on older distros)
if(NOT DEFINED RSTUDIO_VERIFY_R_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion dependencies/linux/README
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RStudio requires relatively recent versions of a number of components. It is
therefore likely to only correctly configure and build on more recent Linux
systems. Specific version requirements for various components include:

- R 3.0.1
- R 3.3.0
- CMake 3.4.3 or newer
- Boost 1.78
- Qt 5.12.8 [Required only for Desktop]
Expand Down
8 changes: 4 additions & 4 deletions docker/jenkins/Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ RUN "echo 'Remove-Item alias:r' | Out-File $PsHome\Profile.ps1"
# install R to c:\R, a common c:\Program issue appears to only happen when installing in docker
RUN $ErrorActionPreference = 'Stop' ;`
[System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48; `
(New-Object System.Net.WebClient).DownloadFile('https://cran.rstudio.com/bin/windows/base/old/3.0.3/R-3.0.3-win.exe', 'c:\R-3.0.3-win.exe') ;`
Start-Process c:\R-3.0.3-win.exe -Wait -ArgumentList '/VERYSILENT /DIR="C:\R\R-3.0.3\"' ;`
Remove-Item c:\R-3.0.3-win.exe -Force
(New-Object System.Net.WebClient).DownloadFile('https://cran.rstudio.com/bin/windows/base/old/3.3.0/R-3.3.0-win.exe', 'c:\R-3.3.0-win.exe') ;`
Start-Process c:\R-3.3.0-win.exe -Wait -ArgumentList '/VERYSILENT /DIR="C:\R\R-3.3.0\"' ;`
Remove-Item c:\R-3.3.0-win.exe -Force

# add R to path
RUN $env:path += ';C:\R\R-3.0.3\bin\i386\' ;`
RUN $env:path += ';C:\R\R-3.3.0\bin\i386\' ;`
[Environment]::SetEnvironmentVariable('Path', $env:path, [System.EnvironmentVariableTarget]::Machine);

# install qt (note that we are using the current directory's context)
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ else()
execute_process(
COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "-s" "-e" "cat(as.character(getRversion()))"
OUTPUT_VARIABLE LIBR_VERSION)
if (LIBR_VERSION VERSION_LESS "3.0.1")
if (LIBR_VERSION VERSION_LESS "3.3.0")
message(FATAL_ERROR "Minimum R version (${RSTUDIO_R_MAJOR_VERSION_REQUIRED}.${RSTUDIO_R_MINOR_VERSION_REQUIRED}.${RSTUDIO_R_PATCH_VERSION_REQUIRED}) not found; detected version is ${LIBR_VERSION}")
endif()
endif()
Expand Down
16 changes: 8 additions & 8 deletions vagrant/provision-multi-r.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ sudo apt-get -y build-dep r-base
cd /tmp

# download tarballs
wget https://cran.r-project.org/src/base/R-2/R-2.15.3.tar.gz
wget https://cran.r-project.org/src/base/R-3/R-3.0.3.tar.gz
wget https://cran.r-project.org/src/base/R-3/R-3.6.3.tar.gz
wget https://cran.r-project.org/src/base/R-4/R-4.1.2.tar.gz

# extract them
tar xzvf R-2.15.3.tar.gz
tar xzvf R-3.0.3.tar.gz
tar xzvf R-3.6.3.tar.gz
tar xzvf R-4.1.2.tar.gz

# build and install each version
cd /tmp/R-2.15.3
./configure --prefix=/opt/R/2.15.3 --enable-R-shlib
cd /tmp/R-3.6.3
./configure --prefix=/opt/R/3.6.3 --enable-R-shlib
make
sudo make install

cd /tmp/R-3.0.3
./configure --prefix=/opt/R/3.0.3 --enable-R-shlib
cd /tmp/R-4.1.2
./configure --prefix=/opt/R/4.1.2 --enable-R-shlib
make
sudo make install

Expand Down

0 comments on commit bf9b146

Please sign in to comment.