Skip to content

Commit 03526f3

Browse files
authored
Update version information for Tahoe (#27)
Note: No new toolchain modifications were done. This is only an extension of the current toolchain onto a new OS.
1 parent ea1a165 commit 03526f3

File tree

7 files changed

+59
-7
lines changed

7 files changed

+59
-7
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: macrtools
22
Title: macOS Rtools package
3-
Version: 0.0.6.1
3+
Version: 0.0.6.2
44
Authors@R: c(
55
person(given = "James Joseph",
66
family = "Balamuta",
@@ -18,7 +18,7 @@ Description: Sets up the macOS Rtools compiled code toolchain.
1818
License: AGPL (>= 3)
1919
Encoding: UTF-8
2020
Roxygen: list(markdown = TRUE)
21-
RoxygenNote: 7.3.2
21+
RoxygenNote: 7.3.3
2222
OS_type: unix
2323
SystemRequirements: macOS
2424
Imports:

R/assertions.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ assert_macos_supported <- function(call = caller_env()) {
4141
mac_version <- shell_mac_version()
4242
cli::cli_abort(c(
4343
"{.pkg macrtools}: Your macOS version {.val {mac_version}} is not supported.",
44-
"{.pkg macrtools}: Supported versions: macOS High Sierra (10.13) through macOS Sequoia (15.x)."
44+
"{.pkg macrtools}: Supported versions: macOS High Sierra (10.13) through macOS Tahoe (26.x)."
4545
),
4646
call = call,
4747
advice = "Please upgrade your macOS to a supported version or use an alternative method to install development tools.")

R/system.R

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,31 @@ shell_mac_version <- function() {
5252
#' @keywords internal
5353
is_macos_r_supported <- function() {
5454
mac_version <- shell_mac_version()
55-
version_between(mac_version, "10.13.0", "16.0.0")
55+
version_between(mac_version, "10.13.0", "26.0")
56+
}
57+
58+
#' Check if macOS Tahoe
59+
#'
60+
#' Tahoe is macOS 26.x, released in late 2025.
61+
#'
62+
#' @details
63+
#' macOS Tahoe (version 26.x) is the successor to macOS Sequoia (version 15.x).
64+
#'
65+
#' @return TRUE if system is macOS Tahoe, FALSE otherwise
66+
#' @keywords internal
67+
is_macos_tahoe <- function() {
68+
mac_version <- shell_mac_version()
69+
version_between(mac_version, "26.0", "27.0")
5670
}
5771

5872
#' Check if macOS Sequoia
5973
#'
74+
#' Sequoia is macOS 15.x, released in late 2024.
75+
#'
76+
#' @details
77+
#' macOS Sequoia (version 15.x) is the successor to macOS
78+
#' Sonoma (version 14.x).
79+
#'
6080
#' @return TRUE if system is macOS Sequoia, FALSE otherwise
6181
#' @keywords internal
6282
is_macos_sequoia <- function() {
@@ -66,6 +86,12 @@ is_macos_sequoia <- function() {
6686

6787
#' Check if macOS Sonoma
6888
#'
89+
#' Sonoma is macOS 14.x, released in late 2023.
90+
#'
91+
#' @details
92+
#' macOS Sonoma (version 14.x) is the successor to macOS
93+
#' Ventura (version 13.x).
94+
#'
6995
#' @return TRUE if system is macOS Sonoma, FALSE otherwise
7096
#' @keywords internal
7197
is_macos_sonoma <- function() {

R/zzz.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
mac_version <- shell_mac_version()
1919
supported_msg <- base::paste0(
2020
"Supported macOS versions: ",
21-
"High Sierra (10.13) through Sequoia (15.x)"
21+
"High Sierra (10.13) through Tahoe (26.x)"
2222
)
2323

2424
base::packageStartupMessage(cli::format_inline(

man/is_macos_sequoia.Rd

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/is_macos_sonoma.Rd

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/is_macos_tahoe.Rd

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)