Skip to content

Bump JASP to 1.0.0, R to 4.6.1, update dependencies #6301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RensDofferhoff wants to merge 5 commits into
base: development
Choose a base branch
from
Open

Bump JASP to 1.0.0, R to 4.6.1, update dependencies #6301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5be9e80
Bump JASP to 1.0.0, R to 4.6.1, update dependencies
invalid-email-address Aug 17, 2026
bb11549
fix the Rfolder mess
invalid-email-address Aug 17, 2026
68b691a
weak gfortran dir and rpsm url
invalid-email-address Aug 17, 2026
2a343ec
update deps moduleBundleManager
invalid-email-address Aug 18, 2026
c408afd
Update Rcpp_RInside.lock
RensDofferhoff Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
JASP_R_VERSION: '4.5.3'
JASP_R_VERSION: '4.6.1'

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: windows-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
JASP_R_VERSION: '4.5.3'
JASP_R_VERSION: '4.6.1'

name: build test on Windows

Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ message: "If you use this software, please cite it as below."
authors:
- family-names: "JASP Team"
title: "JASP"
version: 0.98.1
date-released: 2026-06-02
version: 1.0.0
date-released: 2026-08-17
url: "https://jasp-stats.org/"
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ endif()

project(
JASP
VERSION 0.98.1.0 # <major>[.<minor>[.<patch>[.<tweak>]]]
VERSION 1.0.0.0 # <major>[.<minor>[.<patch>[.<tweak>]]]
LANGUAGES CXX C
HOMEPAGE_URL "http://jasp-stats.org/"
DESCRIPTION "A fresh way to do statistics")
Expand Down
2 changes: 1 addition & 1 deletion Engine/jaspModuleBundleManager
Open in desktop
Submodule jaspModuleBundleManager updated 2 files
+2 −2 R/jaspModuleBundleManager.R
+14 −14 renv.lock
10 changes: 7 additions & 3 deletions Modules/Rcpp_RInside.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"R": {
"Version": "4.3.3",
"Version": "4.6.1",
"Repositories": [
{
"Name": "p3m",
"URL": "https://p3m.dev/cran/2026-08-15"

@JorisGoosen JorisGoosen Aug 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is cran really so bad?

@RensDofferhoff RensDofferhoff Aug 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes binaries are lost after update making it break for all new developers while current ones dont notice due to caching.

I added cran as second repo.

},
{
"Name": "CRAN",
"URL": "https://packagemanager.posit.co/cran/2026-03-31"
"URL": "https://cloud.r-project.org"
}
]
},
Expand All @@ -16,7 +20,7 @@
},
"Rcpp": {
"Package": "Rcpp",
"Version": "1.1.1",
"Version": "1.1.2",
"Source": "Repository"
}
}
Expand Down
27 changes: 22 additions & 5 deletions Tools/CMake/R.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ set(AVAILABLE_R_VERSIONS
"R-4.5.2-x86_64"
"R-4.5.2-arm64"
"R-4.5.2-win"
"R-4.6.1"
"R-4.6.1-x86_64"
"R-4.6.1-arm64"
"R-4.6.1-win"
)

set(R_BINARY_HASHES
Expand Down Expand Up @@ -195,20 +199,33 @@ set(R_BINARY_HASHES
"0184504a11da63b26cc31f91a812e5456d523e0e"
"1cc0b3d78bc3b3857c6bf3128a9d414b130d938e"
"3e9a1cf2f48cab87f62a9f3b374c1faab78e89c6"
#4.6.1
"8d3c9e7a71dcba7602aaaf948b574e2e9d29844e"
"8d3c9e7a71dcba7602aaaf948b574e2e9d29844e"
"fc9f4ada15589e8e037b9bf05563d21e97181635"
"b6d12d5494ded0f65d06e6edbf54ab8288a4a27b"
)


list(APPEND CMAKE_MESSAGE_CONTEXT R)

# dont forget check and upgrande Rtools version if major_minor version changed.
set(R_VERSION "4.5.2")
set(R_VERSION_MAJOR_MINOR "4.5")
set(R_VERSION "4.6.1")
set(R_VERSION_MAJOR_MINOR "4.6")
set(CURRENT_R_VERSION ${R_VERSION_MAJOR_MINOR})

if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
set(R_DIR_NAME "${R_VERSION_MAJOR_MINOR}-arm64")
if(R_VERSION VERSION_GREATER_EQUAL "4.6.0")
if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
set(R_DIR_NAME "${R_VERSION_MAJOR_MINOR}")
else()
set(R_DIR_NAME "${R_VERSION_MAJOR_MINOR}-x86_64")
endif()
else()
set(R_DIR_NAME "${R_VERSION_MAJOR_MINOR}-x86_64")
if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
set(R_DIR_NAME "${R_VERSION_MAJOR_MINOR}-arm64")
else()
set(R_DIR_NAME "${R_VERSION_MAJOR_MINOR}-x86_64")
endif()
endif()

if(WIN32)
Expand Down
5 changes: 5 additions & 0 deletions Tools/flatpak/org.jaspstats.JASP.appdata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<color type="primary" scheme_preference="dark">#14a1e3</color>
</branding>
<releases>
<release version="1.0.0" date="2026-08-17">
<description><p>
See 1.0.0 Release notes on our Github Page
</p></description>
</release>
<release version="0.98.1" date="2026-07-06">
<description><p>
See 0.98.0 Release notes on our Github Page
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.96.0
0.98.3
Loading