Merge pull request #8757 from realm/tg/xcode-16.3

tgoyne · web-flow · commit f8d74e90eafa · 2025-04-14T16:02:43.000-07:00
Add support for Xcode 16.3
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
diff --git a/.github/workflows/master-push.yml b/.github/workflows/master-push.yml
@@ -6,10 +6,10 @@ on:
       - "master"
       - "release/**"
 env:
-  XCODE_VERSION: "['15.3', '15.4', '16', '16.1', '16.2']"
+  XCODE_VERSION: "['15.3', '15.4', '16.2', '16.3']"
   PLATFORM: "['ios', 'osx', 'watchos', 'tvos', 'catalyst', 'visionos']"
-  RELEASE_VERSION: '16.2'
-  DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
+  RELEASE_VERSION: '16.3'
+  DEVELOPER_DIR: /Applications/Xcode_16.3.app/Contents/Developer
 jobs:
   prepare:
       runs-on: ubuntu-latest
@@ -74,15 +74,12 @@ jobs:
             - xcode-version: 15.4
               xcode-version-tag: 15.4
               os: macos-14
-            - xcode-version: 16
-              xcode-version-tag: '16.0'
-              os: macos-15
-            - xcode-version: 16.1
-              xcode-version-tag: 16.1
-              os: macos-15
             - xcode-version: 16.2
               xcode-version-tag: 16.2
               os: macos-15
+            - xcode-version: 16.3
+              xcode-version-tag: 16.3
+              os: macos-15
           exclude:
             - platform: osx
               configuration: static
@@ -217,12 +214,10 @@ jobs:
               os: macos-14
             - xcode-version: 15.4
               os: macos-14
-            - xcode-version: 16
-              os: macos-15
-            - xcode-version: 16.1
-              os: macos-15
             - xcode-version: 16.2
               os: macos-15
+            - xcode-version: 16.3
+              os: macos-15
       env:
         PLATFORM: 'osx'
         DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+20.0.2 Release notes (2025-04-14)
+=============================================================
+
+### Enhancements
+
+* Update build scripts for Xcode 16.2.
+
+### Compatibility
+
+* Carthage release for Swift is built with Xcode 16.3.0.
+* CocoaPods: 1.10 or later.
+* Xcode: 15.3.0-16.3.
+
 20.0.1 Release notes (2024-12-27)
 =============================================================
 
diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 import Foundation
 
 let coreVersion = Version("20.1.0")
-let cocoaVersion = Version("20.0.1")
+let cocoaVersion = Version("20.0.2")
 
 #if compiler(>=6)
 let swiftVersion = [SwiftVersion.version("6")]
diff --git a/Realm/RLMArray.mm b/Realm/RLMArray.mm
@@ -365,7 +365,10 @@ - (void)replaceAllObjectsWithObjects:(NSArray *)objects {
     }
     changeArray(self, NSKeyValueChangeInsertion, NSMakeRange(0, objects.count), ^{
         for (id object in objects) {
-            [_backingCollection addObject:object];
+            // object should always be non-nil since it's a value stored in a
+            // NSArray, but as of Xcode 16.3 [Decimal128?] sometimes ends up
+            // with nil instead of NSNull when bridged from Swift.
+            [_backingCollection addObject:object ?: NSNull.null];
         }
     });
 }
diff --git a/Realm/RLMSet.mm b/Realm/RLMSet.mm
@@ -279,7 +279,10 @@ - (void)replaceAllObjectsWithObjects:(NSArray *)objects {
             return;
         }
         for (id object in objects) {
-            [_backingCollection addObject:object];
+            // object should always be non-nil since it's a value stored in a
+            // NSArray, but as of Xcode 16.3 [Decimal128?] sometimes ends up
+            // with nil instead of NSNull when bridged from Swift.
+            [_backingCollection addObject:object ?: NSNull.null];
         }
     });
 }
diff --git a/Realm/Realm-Info.plist b/Realm/Realm-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.0.1</string>
+	<string>20.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20.0.1</string>
+	<string>20.0.2</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2014-2021 Realm. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
diff --git a/RealmSwift/Tests/PerformanceTests.swift b/RealmSwift/Tests/PerformanceTests.swift
@@ -44,17 +44,14 @@ private nonisolated(unsafe) var smallRealm: Realm!
 private nonisolated(unsafe) var mediumRealm: Realm!
 private nonisolated(unsafe) var largeRealm: Realm!
 
-private let isRunningOnDevice = TARGET_IPHONE_SIMULATOR == 0
-
 @available(*, deprecated) // Silence deprecation warnings for RealmOptional
 class SwiftPerformanceTests: TestCase, @unchecked Sendable {
     override class var defaultTestSuite: XCTestSuite {
-#if !DEBUG && os(iOS) && !targetEnvironment(macCatalyst)
-        if isRunningOnDevice {
-            return super.defaultTestSuite
-        }
-#endif
+#if !DEBUG && os(iOS) && !targetEnvironment(macCatalyst) && !targetEnvironment(simulator)
+        return super.defaultTestSuite
+#else
         return XCTestSuite(name: "SwiftPerformanceTests")
+#endif
     }
 
     override class func setUp() {
diff --git a/build.sh b/build.sh
@@ -1121,9 +1121,9 @@ x.y.z Release notes (yyyy-MM-dd)
 <!-- ### Breaking Changes - ONLY INCLUDE FOR NEW MAJOR version -->
 
 ### Compatibility
-* Carthage release for Swift is built with Xcode 16.2.0.
+* Carthage release for Swift is built with Xcode 16.3.0.
 * CocoaPods: 1.10 or later.
-* Xcode: 15.3.0-16.2.
+* Xcode: 15.3.0-16.3.
 
 ### Internal
 * Upgraded realm-core from ? to ?
diff --git a/dependencies.list b/dependencies.list
@@ -1,2 +1,2 @@
-VERSION=20.0.1
+VERSION=20.0.2
 REALM_CORE_VERSION=v20.1.0
diff --git a/scripts/package_examples.rb b/scripts/package_examples.rb
@@ -44,7 +44,7 @@ def replace_framework(example, framework, path)
   "examples/tvos/swift",
 ]
 
-xcode_versions = %w(15.3 15.4 16 16.1 16.2)
+xcode_versions = %w(15.3 15.4 16.2 16.3)
 
 # Remove reference to Realm.xcodeproj from all example workspaces.
 base_examples.each do |example|
diff --git a/scripts/pr-ci-matrix.rb b/scripts/pr-ci-matrix.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-XCODE_VERSIONS = %w(15.3 15.4 16 16.1 16.2)
-DOC_VERSION = '16.2'
+XCODE_VERSIONS = %w(15.3 15.4 16.2 16.3)
+DOC_VERSION = '16.3'
 
 all = ->(v) { true }
 latest_only = ->(v) { v == XCODE_VERSIONS.last }

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,10 @@ - (void)replaceAllObjectsWithObjects:(NSArray *)objects {`
`365`	`365`	`}`
`366`	`366`	`changeArray(self, NSKeyValueChangeInsertion, NSMakeRange(0, objects.count), ^{`
`367`	`367`	`for (id object in objects) {`
`368`		`- [_backingCollection addObject:object];`
	`368`	`+ // object should always be non-nil since it's a value stored in a`
	`369`	`+ // NSArray, but as of Xcode 16.3 [Decimal128?] sometimes ends up`
	`370`	`+ // with nil instead of NSNull when bridged from Swift.`
	`371`	`+ [_backingCollection addObject:object ?: NSNull.null];`
`369`	`372`	`}`
`370`	`373`	`});`
`371`	`374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,10 @@ - (void)replaceAllObjectsWithObjects:(NSArray *)objects {`
`279`	`279`	`return;`
`280`	`280`	`}`
`281`	`281`	`for (id object in objects) {`
`282`		`- [_backingCollection addObject:object];`
	`282`	`+ // object should always be non-nil since it's a value stored in a`
	`283`	`+ // NSArray, but as of Xcode 16.3 [Decimal128?] sometimes ends up`
	`284`	`+ // with nil instead of NSNull when bridged from Swift.`
	`285`	`+ [_backingCollection addObject:object ?: NSNull.null];`
`283`	`286`	`}`
`284`	`287`	`});`
`285`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-VERSION=20.0.1`
	`1`	`+VERSION=20.0.2`
`2`	`2`	`REALM_CORE_VERSION=v20.1.0`