Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: macrtools
Title: macOS Rtools package
Version: 0.0.6.1
Version: 0.0.6.2
Authors@R: c(
person(given = "James Joseph",
family = "Balamuta",
Expand All @@ -18,7 +18,7 @@ Description: Sets up the macOS Rtools compiled code toolchain.
License: AGPL (>= 3)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
RoxygenNote: 7.3.3
OS_type: unix
SystemRequirements: macOS
Imports:
Expand Down
2 changes: 1 addition & 1 deletion R/assertions.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ assert_macos_supported <- function(call = caller_env()) {
mac_version <- shell_mac_version()
cli::cli_abort(c(
"{.pkg macrtools}: Your macOS version {.val {mac_version}} is not supported.",
"{.pkg macrtools}: Supported versions: macOS High Sierra (10.13) through macOS Sequoia (15.x)."
"{.pkg macrtools}: Supported versions: macOS High Sierra (10.13) through macOS Tahoe (26.x)."
),
call = call,
advice = "Please upgrade your macOS to a supported version or use an alternative method to install development tools.")
Expand Down
28 changes: 27 additions & 1 deletion R/system.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,31 @@ shell_mac_version <- function() {
#' @keywords internal
is_macos_r_supported <- function() {
mac_version <- shell_mac_version()
version_between(mac_version, "10.13.0", "16.0.0")
version_between(mac_version, "10.13.0", "26.0")
}

#' Check if macOS Tahoe
#'
#' Tahoe is macOS 26.x, released in late 2025.
#'
#' @details
#' macOS Tahoe (version 26.x) is the successor to macOS Sequoia (version 15.x).
#'
#' @return TRUE if system is macOS Tahoe, FALSE otherwise
#' @keywords internal
is_macos_tahoe <- function() {
mac_version <- shell_mac_version()
version_between(mac_version, "26.0", "27.0")
}

#' Check if macOS Sequoia
#'
#' Sequoia is macOS 15.x, released in late 2024.
#'
#' @details
#' macOS Sequoia (version 15.x) is the successor to macOS
#' Sonoma (version 14.x).
#'
#' @return TRUE if system is macOS Sequoia, FALSE otherwise
#' @keywords internal
is_macos_sequoia <- function() {
Expand All @@ -66,6 +86,12 @@ is_macos_sequoia <- function() {

#' Check if macOS Sonoma
#'
#' Sonoma is macOS 14.x, released in late 2023.
#'
#' @details
#' macOS Sonoma (version 14.x) is the successor to macOS
#' Ventura (version 13.x).
#'
#' @return TRUE if system is macOS Sonoma, FALSE otherwise
#' @keywords internal
is_macos_sonoma <- function() {
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
mac_version <- shell_mac_version()
supported_msg <- base::paste0(
"Supported macOS versions: ",
"High Sierra (10.13) through Sequoia (15.x)"
"High Sierra (10.13) through Tahoe (26.x)"
)

base::packageStartupMessage(cli::format_inline(
Expand Down
6 changes: 5 additions & 1 deletion man/is_macos_sequoia.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion man/is_macos_sonoma.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions man/is_macos_tahoe.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.