Skip to content

Commit 19b98b3

Browse files
authored
Merge pull request #8770 from realm/tg/xcode-26
Add support for building with Xcode 26
2 parents 712c52a + ceecd42 commit 19b98b3

File tree

7 files changed

+17
-5
lines changed

7 files changed

+17
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
x.y.z Release notes (yyyy-MM-dd)
22
=============================================================
33
### Enhancements
4-
* None.
4+
* Add support for building with Xcode 26 beta 1.
55

66
### Fixed
77
* <How to hit and notice issue? what was the impact?> ([#????](https://github.com/realm/realm-swift/issues/????), since v?.?.?)
@@ -14,7 +14,7 @@ x.y.z Release notes (yyyy-MM-dd)
1414
* APIs are backwards compatible with all previous releases in the 10.x.y series.
1515
* Carthage release for Swift is built with Xcode 16.3.0.
1616
* CocoaPods: 1.10 or later.
17-
* Xcode: 15.3.0-16.3.
17+
* Xcode: 15.3.0-26 beta 1.
1818

1919
### Internal
2020
* Upgraded realm-core from ? to ?

Configuration/Base.xcconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,19 @@ CODE_SIGNING_REQUIRED[sdk=macosx] = NO;
6161

6262
IPHONEOS_DEPLOYMENT_TARGET_1500 = 12.0;
6363
IPHONEOS_DEPLOYMENT_TARGET_1600 = 12.0;
64+
IPHONEOS_DEPLOYMENT_TARGET_2600 = 12.0;
6465
IPHONEOS_DEPLOYMENT_TARGET = $(IPHONEOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
6566
MACOSX_DEPLOYMENT_TARGET_1500 = 10.14;
6667
MACOSX_DEPLOYMENT_TARGET_1600 = 10.14;
68+
MACOSX_DEPLOYMENT_TARGET_2600 = 10.14;
6769
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
6870
WATCHOS_DEPLOYMENT_TARGET_1500 = 4.0;
6971
WATCHOS_DEPLOYMENT_TARGET_1600 = 4.0;
72+
WATCHOS_DEPLOYMENT_TARGET_2600 = 4.0;
7073
WATCHOS_DEPLOYMENT_TARGET = $(WATCHOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
7174
TVOS_DEPLOYMENT_TARGET_1500 = 12.0;
7275
TVOS_DEPLOYMENT_TARGET_1600 = 12.0;
76+
TVOS_DEPLOYMENT_TARGET_2600 = 12.0;
7377
TVOS_DEPLOYMENT_TARGET = $(TVOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
7478

7579
APPLICATION_EXTENSION_API_ONLY = YES;
@@ -80,5 +84,6 @@ TARGETED_DEVICE_FAMILY = 1,2,3,4,6,7;
8084

8185
SWIFT_VERSION_1500 = 5.7;
8286
SWIFT_VERSION_1600 = 5.7;
87+
SWIFT_VERSION_2600 = 5;
8388
SWIFT_VERSION = $(SWIFT_VERSION_$(XCODE_VERSION_MAJOR));
8489

Package.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ let package = Package(
187187
"RealmSwift.podspec",
188188
"SUPPORT.md",
189189
"build.sh",
190-
"ci_scripts/ci_post_clone.sh",
191190
"contrib",
192191
"dependencies.list",
193192
"docs",

Realm.podspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,19 @@ Pod::Spec.new do |s|
132132

133133
'IPHONEOS_DEPLOYMENT_TARGET_1500' => '12.0',
134134
'IPHONEOS_DEPLOYMENT_TARGET_1600' => '12.0',
135+
'IPHONEOS_DEPLOYMENT_TARGET_2600' => '12.0',
135136
'IPHONEOS_DEPLOYMENT_TARGET' => '$(IPHONEOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
136137
'MACOSX_DEPLOYMENT_TARGET_1500' => '10.13',
137138
'MACOSX_DEPLOYMENT_TARGET_1600' => '10.13',
139+
'MACOSX_DEPLOYMENT_TARGET_2600' => '10.13',
138140
'MACOSX_DEPLOYMENT_TARGET' => '$(MACOSX_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
139141
'WATCHOS_DEPLOYMENT_TARGET_1500' => '4.0',
140142
'WATCHOS_DEPLOYMENT_TARGET_1600' => '4.0',
143+
'WATCHOS_DEPLOYMENT_TARGET_2600' => '4.0',
141144
'WATCHOS_DEPLOYMENT_TARGET' => '$(WATCHOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
142145
'TVOS_DEPLOYMENT_TARGET_1500' => '12.0',
143146
'TVOS_DEPLOYMENT_TARGET_1600' => '12.0',
147+
'TVOS_DEPLOYMENT_TARGET_2600' => '12.0',
144148
'TVOS_DEPLOYMENT_TARGET' => '$(TVOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
145149

146150
'OTHER_LDFLAGS' => '"-Wl,-unexported_symbols_list,${PODS_ROOT}/Realm/Configuration/Realm/PrivateSymbols.txt"',

Realm/RLMCollection.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ NSUInteger RLMUnmanagedFastEnumerate(id collection, NSFastEnumerationState *stat
226226

227227
NSUInteger i = 0;
228228
for (id object in collection) {
229-
copy->items[i++] = object;
229+
copy->items.get()[i++] = object;
230230
}
231231

232232
state->itemsPtr = (__unsafe_unretained id *)(void *)copy->items.get();

RealmSwift.podspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,19 @@ Pod::Spec.new do |s|
3535

3636
'IPHONEOS_DEPLOYMENT_TARGET_1500' => '12.0',
3737
'IPHONEOS_DEPLOYMENT_TARGET_1600' => '12.0',
38+
'IPHONEOS_DEPLOYMENT_TARGET_2600' => '12.0',
3839
'IPHONEOS_DEPLOYMENT_TARGET' => '$(IPHONEOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
3940
'MACOSX_DEPLOYMENT_TARGET_1500' => '10.13',
4041
'MACOSX_DEPLOYMENT_TARGET_1600' => '10.13',
42+
'MACOSX_DEPLOYMENT_TARGET_2600' => '10.13',
4143
'MACOSX_DEPLOYMENT_TARGET' => '$(MACOSX_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
4244
'WATCHOS_DEPLOYMENT_TARGET_1500' => '4.0',
4345
'WATCHOS_DEPLOYMENT_TARGET_1600' => '4.0',
46+
'WATCHOS_DEPLOYMENT_TARGET_2600' => '4.0',
4447
'WATCHOS_DEPLOYMENT_TARGET' => '$(WATCHOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
4548
'TVOS_DEPLOYMENT_TARGET_1500' => '12.0',
4649
'TVOS_DEPLOYMENT_TARGET_1600' => '12.0',
50+
'TVOS_DEPLOYMENT_TARGET_2600' => '12.0',
4751
'TVOS_DEPLOYMENT_TARGET' => '$(TVOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
4852
}
4953
end

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ x.y.z Release notes (yyyy-MM-dd)
11691169
* APIs are backwards compatible with all previous releases in the 10.x.y series.
11701170
* Carthage release for Swift is built with Xcode 16.3.0.
11711171
* CocoaPods: 1.10 or later.
1172-
* Xcode: 15.3.0-16.3.
1172+
* Xcode: 15.3.0-26 beta 1.
11731173
11741174
### Internal
11751175
* Upgraded realm-core from ? to ?

0 commit comments

Comments
 (0)