Skip to content

Update for Xcode26 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnfairh merged 2 commits into from
Oct 27, 2025
Merged

Update for Xcode26 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a33acc
Updates for Xcode26 core data codegen
johnfairh Oct 27, 2025
2283cc1
Move CI to Xcode 26.1
johnfairh Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '16.3'
xcode-version: '26.1.0-beta'
- uses: actions/checkout@v4
with:
persist-credentials: false
Expand Down
192 changes: 98 additions & 94 deletions TMLPersistentContainer.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion TMLPersistentContainer.xcodeproj/xcshareddata/xcschemes/TMLPersistentContainer-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ntainer.xcodeproj/xcshareddata/xcschemes/TMLPersistentContainer-macOS TestCompat.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
5 changes: 3 additions & 2 deletions ...ersistentContainer.xcodeproj/xcshareddata/xcschemes/TMLPersistentContainer-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -78,7 +78,8 @@
</EnvironmentVariables>
<Testables>
<TestableReference
skipped = "NO">
skipped = "NO"
parallelizable = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DD7502791C68FCFC006590AF"
Expand Down
2 changes: 1 addition & 1 deletion TMLPersistentContainer.xcodeproj/xcshareddata/xcschemes/TMLPersistentContainer-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...sistentContainer.xcodeproj/xcshareddata/xcschemes/TMLPersistentContainer-watchOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
14 changes: 7 additions & 7 deletions Tests/TMLPersistentContainerTests/ModelNames.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ enum ModelName: String {
/// Version 3 - {id: Int32, count: Int32}

/// Unversioned model containing version 1 of the SimpleItem entity
case TestModel_Simple_1
case TestModel_Simple_1 = "TestModel_Simple_A"

/// Versioned model containing version 1 + 2 of the SimpleItem entity
case TestModel_Simple_2
case TestModel_Simple_2 = "TestModel_Simple_B"

/// Versioned model containing versions 1 + 2 + 3 of the SimpleItem entity
case TestModel_Simple_3
case TestModel_Simple_3 = "TestModel_Simple_C"

/// A non-existent model
case NonExistentModel
Expand All @@ -43,9 +43,9 @@ enum ModelName: String {
/// Version 2 - {id2: Int, counter2: Int}

/// Base version containing version 1 of both entities
case TestModel_MultiConfig_1
case TestModel_MultiConfig_1 = "TestModel_MultiConfig_A"

/// Versioned model containing versions 1 + 1 of both entities
case TestModel_MultiConfig_2
case TestModel_MultiConfig_2 = "TestModel_MultiConfig_B"
}

2 changes: 1 addition & 1 deletion Tests/TMLPersistentContainerTests/TestBugs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class TestBugs: XCTestCase {

// Load model + set up persistent container as normal

let modelFileName = "TestModel_Simple_1" // must have at least one entity
let modelFileName = ModelName.TestModel_Simple_1.rawValue
let storeFileName = "TestBugs_1_Store"

let unitTestBundle = Bundle(for: type(of: self))
Expand Down
0 ...tModel_MultiConfig_1.xcdatamodel/contents → ...tModel_MultiConfig_A.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tiConfig_2.xcdatamodeld/.xccurrentversion → ...tiConfig_B.xcdatamodeld/.xccurrentversion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>TestModel_MultiConfig_2.xcdatamodel</string>
<string>TestModel_MultiConfig_B.xcdatamodel</string>
</dict>
</plist>
0 ...tModel_MultiConfig_1.xcdatamodel/contents → ...tModel_MultiConfig_A.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...tModel_MultiConfig_2.xcdatamodel/contents → ...tModel_MultiConfig_B.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...d/TestModel_Simple_1.xcdatamodel/contents → ...d/TestModel_Simple_A.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...l_Simple_2.xcdatamodeld/.xccurrentversion → ...l_Simple_B.xcdatamodeld/.xccurrentversion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>TestModel_Simple_2.xcdatamodel</string>
<string>TestModel_Simple_B.xcdatamodel</string>
</dict>
</plist>
0 ...d/TestModel_Simple_1.xcdatamodel/contents → ...d/TestModel_Simple_A.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...d/TestModel_Simple_2.xcdatamodel/contents → ...d/TestModel_Simple_B.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...l_Simple_3.xcdatamodeld/.xccurrentversion → ...l_Simple_C.xcdatamodeld/.xccurrentversion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>TestModel_Simple_3.xcdatamodel</string>
<string>TestModel_Simple_C.xcdatamodel</string>
</dict>
</plist>
0 ...d/TestModel_Simple_1.xcdatamodel/contents → ...d/TestModel_Simple_A.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...d/TestModel_Simple_2.xcdatamodel/contents → ...d/TestModel_Simple_B.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...d/TestModel_Simple_3.xcdatamodel/contents → ...d/TestModel_Simple_C.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.