diff --git a/DESCRIPTION b/DESCRIPTION index 1bc462b..bf3de7a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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", @@ -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: diff --git a/R/assertions.R b/R/assertions.R index b7f3f59..add76e0 100644 --- a/R/assertions.R +++ b/R/assertions.R @@ -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.") diff --git a/R/system.R b/R/system.R index afbdbe9..5b5513b 100644 --- a/R/system.R +++ b/R/system.R @@ -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() { @@ -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() { diff --git a/R/zzz.R b/R/zzz.R index 02bd6f8..212f9c2 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -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( diff --git a/man/is_macos_sequoia.Rd b/man/is_macos_sequoia.Rd index e5dc009..bd1354d 100644 --- a/man/is_macos_sequoia.Rd +++ b/man/is_macos_sequoia.Rd @@ -10,6 +10,10 @@ is_macos_sequoia() TRUE if system is macOS Sequoia, FALSE otherwise } \description{ -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). } \keyword{internal} diff --git a/man/is_macos_sonoma.Rd b/man/is_macos_sonoma.Rd index 43ad91b..4051eb8 100644 --- a/man/is_macos_sonoma.Rd +++ b/man/is_macos_sonoma.Rd @@ -10,6 +10,10 @@ is_macos_sonoma() TRUE if system is macOS Sonoma, FALSE otherwise } \description{ -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). } \keyword{internal} diff --git a/man/is_macos_tahoe.Rd b/man/is_macos_tahoe.Rd new file mode 100644 index 0000000..3e0f36b --- /dev/null +++ b/man/is_macos_tahoe.Rd @@ -0,0 +1,18 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/system.R +\name{is_macos_tahoe} +\alias{is_macos_tahoe} +\title{Check if macOS Tahoe} +\usage{ +is_macos_tahoe() +} +\value{ +TRUE if system is macOS Tahoe, FALSE otherwise +} +\description{ +Tahoe is macOS 26.x, released in late 2025. +} +\details{ +macOS Tahoe (version 26.x) is the successor to macOS Sequoia (version 15.x). +} +\keyword{internal}