Bump minimum deployment targets to the minimums supported by Xcode 15 (#7648)

Submitting apps built with Xcode 14 to the app store is no longer allowed, so
we no longer support building with Xcode 14.

Author: tgoyne

CHANGELOG.md

@@ -21,6 +21,8 @@
 * Follow on to ([PR #7300](https://github.com/realm/realm-core/pull/7300)) to allow SDKs to construct a fake user for testing SyncManager::get_user -> App::create_fake_user_for_testing ([PR #7632](https://github.com/realm/realm-core/pull/7632))
 * Fix build-apple-device.sh, broken in [#7603](https://github.com/realm/realm-core/pull/7603) ([PR #7640](https://github.com/realm/realm-core/pull/7640)).
 * Added a CAPI interface for SDKs to bring their own managed users with core's app services turned off. ([PR #7615](https://github.com/realm/realm-core/pull/7615)).
+* Bump the minimum deployment targets on Apple platforms to the minimums supported by Xcode 15 and clean up now unused availability checks. ([PR #7648](https://github.com/realm/realm-core/pull/7648)).
+
 ----------------------------------------------
 
 # 14.6.0 Release notes

Package.swift

@@ -354,8 +354,8 @@ let bidExcludes: [String] = [
 
 let platforms: [SupportedPlatform] = [
     .macOS(.v10_13),
-    .iOS(.v11),
-    .tvOS(.v11),
+    .iOS(.v12),
+    .tvOS(.v12),
     .watchOS(.v4)
 ]
 

src/realm/object-store/impl/apple/keychain_helper.cpp

@@ -36,21 +36,17 @@ REALM_NORETURN
 REALM_COLD
 void keychain_access_exception(int32_t error_code)
 {
-    if (__builtin_available(iOS 11.3, macOS 10.3, tvOS 11.3, watchOS 4.3, *)) {
-        if (auto message = adoptCF(SecCopyErrorMessageString(error_code, nullptr))) {
-            if (auto msg = CFStringGetCStringPtr(message.get(), kCFStringEncodingUTF8)) {
-                throw RuntimeError(
-                    ErrorCodes::RuntimeError,
-                    util::format("Keychain returned unexpected status code: %1 (%2)", msg, error_code));
-            }
-            auto length =
-                CFStringGetMaximumSizeForEncoding(CFStringGetLength(message.get()), kCFStringEncodingUTF8) + 1;
-            auto buffer = std::make_unique<char[]>(length);
-            if (CFStringGetCString(message.get(), buffer.get(), length, kCFStringEncodingUTF8)) {
-                throw RuntimeError(
-                    ErrorCodes::RuntimeError,
-                    util::format("Keychain returned unexpected status code: %1 (%2)", buffer.get(), error_code));
-            }
+    if (auto message = adoptCF(SecCopyErrorMessageString(error_code, nullptr))) {
+        if (auto msg = CFStringGetCStringPtr(message.get(), kCFStringEncodingUTF8)) {
+            throw RuntimeError(ErrorCodes::RuntimeError,
+                               util::format("Keychain returned unexpected status code: %1 (%2)", msg, error_code));
+        }
+        auto length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(message.get()), kCFStringEncodingUTF8) + 1;
+        auto buffer = std::make_unique<char[]>(length);
+        if (CFStringGetCString(message.get(), buffer.get(), length, kCFStringEncodingUTF8)) {
+            throw RuntimeError(
+                ErrorCodes::RuntimeError,
+                util::format("Keychain returned unexpected status code: %1 (%2)", buffer.get(), error_code));
         }
     }
     throw RuntimeError(ErrorCodes::RuntimeError,

src/realm/sync/network/network_ssl.cpp

@@ -207,15 +207,10 @@ std::string SecureTransportErrorCategory::message(int value) const
     const char* message = "Unknown error";
 #if REALM_HAVE_SECURE_TRANSPORT
     std::unique_ptr<char[]> buffer;
-    if (__builtin_available(iOS 11.3, macOS 10.3, tvOS 11.3, watchOS 4.3, *)) {
-        auto status = OSStatus(value);
-        void* reserved = nullptr;
-        if (auto cf_message = adoptCF(SecCopyErrorMessageString(status, reserved)))
-            message = cfstring_to_cstring(cf_message.get(), buffer);
-    }
-    else {
-        static_cast<void>(buffer);
-    }
+    auto status = OSStatus(value);
+    void* reserved = nullptr;
+    if (auto cf_message = adoptCF(SecCopyErrorMessageString(status, reserved)))
+        message = cfstring_to_cstring(cf_message.get(), buffer);
 #endif // REALM_HAVE_SECURE_TRANSPORT
 
     return util::format("SecureTransport error: %1 (%2)", message, value); // Throws

src/realm/util/compression.cpp

@@ -593,12 +593,8 @@ std::error_code decompress(InputStream& compressed, Span<const char> compressed_
     }
 
 #if REALM_USE_LIBCOMPRESSION
-    // All of our non-macOS deployment targets are high enough to have libcompression,
-    // but we support some older macOS versions
-    if (__builtin_available(macOS 10.11, *)) {
-        if (algorithm != Algorithm::None)
-            return decompress_libcompression(compressed, compressed_buf, decompressed_buf, algorithm, has_header);
-    }
+    if (algorithm != Algorithm::None)
+        return decompress_libcompression(compressed, compressed_buf, decompressed_buf, algorithm, has_header);
 #endif
 
     switch (algorithm) {
@@ -689,7 +685,7 @@ std::error_code compress_lzfse_or_zlib(Span<const char> uncompressed_buf, Span<c
 {
     using namespace compression;
 #if REALM_USE_LIBCOMPRESSION
-    if (__builtin_available(macOS 10.11, *)) {
+    {
         size_t len = write_header({Algorithm::Lzfse, uncompressed_buf.size()}, compressed_buf);
         auto ec = compress_lzfse(uncompressed_buf, compressed_buf.sub_span(len), compressed_size, custom_allocator);
         if (ec != error::compress_input_too_long)
@@ -936,10 +932,8 @@ std::unique_ptr<InputStream> compression::decompress_nonportable_input_stream(In
     if (header.algorithm == Algorithm::None)
         return std::make_unique<DecompressInputStreamNone>(source, first_block);
 #if REALM_USE_LIBCOMPRESSION
-    if (__builtin_available(macOS 10.11, *)) {
-        if (header.algorithm == Algorithm::Deflate || header.algorithm == Algorithm::Lzfse)
-            return std::make_unique<DecompressInputStreamLibCompression>(source, first_block, header);
-    }
+    if (header.algorithm == Algorithm::Deflate || header.algorithm == Algorithm::Lzfse)
+        return std::make_unique<DecompressInputStreamLibCompression>(source, first_block, header);
 #endif
     if (header.algorithm == Algorithm::Deflate)
         return std::make_unique<DecompressInputStreamZlib>(source, first_block, total_size);

src/realm/util/file_mapper.cpp

@@ -241,13 +241,8 @@ static dispatch_queue_t reclaimer_queue;
 static void ensure_reclaimer_thread_runs()
 {
     if (!reclaimer_timer) {
-        if (__builtin_available(iOS 10, macOS 12, tvOS 10, watchOS 3, *)) {
-            reclaimer_queue = dispatch_queue_create_with_target("io.realm.page-reclaimer", DISPATCH_QUEUE_SERIAL,
-                                                                dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0));
-        }
-        else {
-            reclaimer_queue = dispatch_queue_create("io.realm.page-reclaimer", DISPATCH_QUEUE_SERIAL);
-        }
+        reclaimer_queue = dispatch_queue_create_with_target("io.realm.page-reclaimer", DISPATCH_QUEUE_SERIAL,
+                                                            dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0));
         reclaimer_timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, reclaimer_queue);
         dispatch_source_set_timer(reclaimer_timer, DISPATCH_TIME_NOW, NSEC_PER_SEC, NSEC_PER_SEC);
         dispatch_source_set_event_handler(reclaimer_timer, ^{

src/realm/util/interprocess_condvar.hpp

@@ -118,16 +118,6 @@ class InterprocessCondVar {
                 struct timespec now;
 #ifdef _WIN32
                 timespec_get(&now, TIME_UTC);
-#elif REALM_PLATFORM_APPLE
-                if (__builtin_available(iOS 10, macOS 12, tvOS 10, watchOS 3, *)) {
-                    clock_gettime(CLOCK_REALTIME, &now);
-                }
-                else {
-                    timeval tv;
-                    gettimeofday(&tv, 0);
-                    now.tv_sec = tv.tv_sec;
-                    now.tv_nsec = tv.tv_usec * 1000;
-                }
 #else
                 clock_gettime(CLOCK_REALTIME, &now);
 #endif

src/realm/util/terminate.cpp

@@ -26,9 +26,7 @@
 #include <realm/version.hpp>
 
 #if REALM_PLATFORM_APPLE
-
 #include <os/log.h>
-#include <asl.h>
 
 #include <dlfcn.h>
 #include <execinfo.h>
@@ -78,18 +76,10 @@ void nslog(const char* message) noexcept
     // Standard error goes nowhere for applications managed by launchd,
     // so log to ASL/unified logging system logs as well.
     fputs(message, stderr);
-    if (__builtin_available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)) {
-        // The unified logging system considers dynamic strings to be private in
-        // order to protect users. This means we must specify "%{public}s" to get
-        // the message here. See `man os_log` for more details.
-        os_log_error(OS_LOG_DEFAULT, "%{public}s", message);
-    }
-    else {
-        REALM_DIAG_PUSH();
-        REALM_DIAG(ignored "-Wdeprecated");
-        asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", message);
-        REALM_DIAG_POP();
-    }
+    // The unified logging system considers dynamic strings to be private in
+    // order to protect users. This means we must specify "%{public}s" to get
+    // the message here. See `man os_log` for more details.
+    os_log_error(OS_LOG_DEFAULT, "%{public}s", message);
     // Log the message to Crashlytics if it's loaded into the process
     void* addr = dlsym(RTLD_DEFAULT, "CLSLog");
     if (addr) {

tools/cmake/xcode.toolchain.cmake

@@ -30,12 +30,12 @@ if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_SDKROOT)
     set(CMAKE_XCODE_ATTRIBUTE_SDKROOT "$(SDKROOT_$(XCODE_VERSION_MAJOR))")
 endif()
 
-set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "11.0")
+set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "12.0")
 set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET_CATALYST_NO "10.13")
 set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET_CATALYST_YES "10.15")
 set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "$(MACOSX_DEPLOYMENT_TARGET_CATALYST_$(IS_MACCATALYST))")
 set(CMAKE_XCODE_ATTRIBUTE_WATCHOS_DEPLOYMENT_TARGET "4.0")
-set(CMAKE_XCODE_ATTRIBUTE_TVOS_DEPLOYMENT_TARGET "11.0")
+set(CMAKE_XCODE_ATTRIBUTE_TVOS_DEPLOYMENT_TARGET "12.0")
 
 set(REALM_ENABLE_ASSERTIONS ON CACHE BOOL "Enable release assertions")
 set(REALM_XCODE_TOOLCHAIN TRUE)