Migrate openHABCore to Swift 6 by timbms · Pull Request #961 · openhab/openhab-ios

timbms · 2025-09-10T18:39:19Z

No description provided.

Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

@test

…ng, made tests compatible with Swift 6 Added @test(...) attributes with descriptive names, Removed test prefix from method names, Used #expect() instead of XCTAssert* macros Used nonisolated(unsafe) for mutable properties in the mock delegate, Made the mock delegate conform to @unchecked Sendable Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

timbms · 2025-09-14T08:07:28Z

@TAKeanice: Please have a look at this PR.

Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

…dy enabled as of Swift version 6 Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

Copilot

Pull Request Overview

This PR migrates the openHAB iOS app project from Swift 5.10 to Swift 6, implementing strict concurrency checking and modernizing the testing framework.

Updates Swift toolchain version to 6.0/6.1 across project files and CI configuration
Replaces XCTest with Swift Testing framework in test files
Removes OpenAPI dependencies and simplifies Swift upcoming feature flags to essential ones only

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
openHAB.xcodeproj/project.pbxproj	Updates Swift version to 6.0 and removes OpenAPI package dependencies and most Swift upcoming feature flags
fastlane/Fastfile	Updates iOS simulator version from 18.1 to 18.4 for testing
ServerCertificateManagerTests.swift	Migrates from XCTest to Swift Testing framework with proper concurrency annotations
MockURLProtocol.swift	Removes unused mock protocol class
ClampedTests.swift	Adds new test file using Swift Testing framework
OpenAPIService.swift	Introduces type eraser AnyAsyncSequence for API compatibility
Package.swift	Updates Swift tools version to 6.1 and simplifies upcoming feature flags
AGENT.md	Updates documentation to reflect Swift 6 usage
.github/workflows/pull_requests.yml	Pins Xcode version to 16.4 for CI consistency

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-14T09:45:31Z

+final class MockServerCertificateDelegate: ServerCertificateManagerDelegate, @unchecked Sendable {
+    nonisolated(unsafe) var lastCall = ""
+    nonisolated(unsafe) var expectedResult: ServerCertificateManager.EvaluateResult = .permitOnce
+    nonisolated(unsafe) var acceptedChangedCalled = false

-    func evaluateServerTrust(summary: String?, forDomain domain: String?) async -> ServerCertificateManager.EvaluateResult {
+    nonisolated func evaluateServerTrust(summary: String?, forDomain domain: String?) async -> ServerCertificateManager.EvaluateResult {
        lastCall = "evaluateServerTrust"
        return expectedResult
    }

-    func evaluateCertificateMismatch(summary: String?, forDomain domain: String?) async -> ServerCertificateManager.EvaluateResult {
+    nonisolated func evaluateCertificateMismatch(summary: String?, forDomain domain: String?) async -> ServerCertificateManager.EvaluateResult {
        lastCall = "evaluateCertificateMismatch"
        return expectedResult
    }

-    func acceptedServerCertificatesChanged() {
+    nonisolated func acceptedServerCertificatesChanged() {


Using @unchecked Sendable with nonisolated(unsafe) properties creates potential data races in concurrent test execution. Consider using actor isolation or proper synchronization mechanisms instead of bypassing Swift's concurrency safety.

I know that I am bypassing concurrency safety. At least it unblocks the current situation for testing.

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>

timbms · 2025-09-17T06:21:31Z

We should not merge yet. It compiles on GitHub with Xcode 16.4 but not with Xcode 26.0!
Apparently 6.2 is correcting a lenient treatment of static properties for actors: swiftlang/swift#78435
@TAKeanice Hopefully you can find a workaround.

TAKeanice · 2025-09-17T12:58:12Z

@TAKeanice Hopefully you can find a workaround.

I will work on it tomorrow early morning!

TAKeanice · 2025-09-20T13:49:04Z

@TAKeanice Hopefully you can find a workaround.

I will work on it tomorrow early morning!

That morning was spent trying to get XCode26 onto my system... I will try and solve the problem tomorrow, but I already got a pretty good idea about the problem from the description on the swiftlang discussion.

Swift 6.2 throws concurrency checker errors on static properties in actors, since they are not isolated Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

to avoid problems with calls from synchronous main-actor isolated code Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

TAKeanice · 2025-09-21T22:39:15Z

My XCode 16 now compiles the code, and my phone seems to run everything properly.

timbms · 2025-09-22T06:12:04Z

That is a big change. Impressive piece of work @TAKeanice

TAKeanice · 2025-09-22T06:24:11Z

That is a big change. Impressive piece of work @TAKeanice

I go along with the big, but don't find it impressive, since I gave up in the end and synced everything to the main actor instead of having preferences be a separate one. That's partially because actor boundaries can only be crossed in async functions, but not all Apple framework functions have a sensible way of making them async (e.g. combine, or app delegate callbacks). That means I would have to use Task excessively, and that makes me afraid of breaking things that were previously assumed to happen in sequence.

timbms · 2025-09-22T07:44:36Z

Still. You found a solution!
One more thing: You may have seen that the deployment to TestFlight failed. I don't understand why the final compile run after test failed.

timbms · 2025-09-22T09:09:08Z

According to Copilot Explain:
The main cause of the failure is this error in OpenHABCore/Sources/OpenHABCore/Util/SessionChallengeHandler.swift, line 49:

sending value of non-Sendable type 'ServerCertificateManager' risks causing data races

And indeed, if I build with the Release configuration, I can confirm that I get this compiler error.

Marking ServerCertificateManager @unchecked Sendable
public final class ServerCertificateManager: @unchecked Sendable {
solves the issue, but with an optimistic assumption

TAKeanice · 2025-09-22T17:54:53Z

I don´t understand that difference between debug and release mode yet. Both the method onReceiveSessionChallenge in the SessionChallengeHandler as well as the property serverCertificateManager are isolated to the MainActor. Where is the sending happening?

timbms · 2025-09-22T19:21:49Z

Have a look at #968.
That fixed the issue.

timbms and others added 3 commits September 10, 2025 20:38

Migrate openHABCore to Swift 6

2c9a073

Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

Merge branch 'develop' into migrateOpenHABCoreToSwift6

16ce339

timbms requested a review from TAKeanice September 14, 2025 08:07

timbms added 3 commits September 14, 2025 10:29

Migrate to iOS 18.4 for simulator tests

9fbcfd7

Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

Set the Xcode version to 16.4

0a7ad5a

Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

Disable upcoming features like 'DynamicActorIsolation' that are alrea…

68a9256

…dy enabled as of Swift version 6 Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>

timbms requested a review from Copilot September 14, 2025 09:44

Copilot AI reviewed Sep 14, 2025

View reviewed changes

Merge branch 'develop' into migrateOpenHABCoreToSwift6

6bb6895

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>

TAKeanice added 6 commits September 21, 2025 14:48

attempt to make Preferences thread-safe

a0c3cbd

Swift 6.2 throws concurrency checker errors on static properties in actors, since they are not isolated Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

preliminary concurrency "fixes" for intents and some views

622847a

Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

More Swift 6.2 concurrency fixes

1d38f95

Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

remove unnecessary "Task"s

cc9f66f

Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

More logging for debugging long wait times when changing homes

7ae8f4f

Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

Isolate preferences to main actor

da2d771

to avoid problems with calls from synchronous main-actor isolated code Signed-off-by: Tassilo Karge <tassilo.karge@web.de>

TAKeanice approved these changes Sep 21, 2025

View reviewed changes

timbms merged commit beaa605 into develop Sep 22, 2025
3 checks passed

timbms deleted the migrateOpenHABCoreToSwift6 branch September 22, 2025 06:14

digitaldan mentioned this pull request Sep 26, 2025

Regression crashing intents and notifications #975

Open

Uh oh!

Conversation

timbms commented Sep 10, 2025

Uh oh!

timbms commented Sep 14, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Copilot AI Sep 14, 2025

Choose a reason for hiding this comment

Uh oh!

timbms Sep 14, 2025

Choose a reason for hiding this comment

Uh oh!

timbms commented Sep 17, 2025

Uh oh!

TAKeanice commented Sep 17, 2025

Uh oh!

TAKeanice commented Sep 20, 2025

Uh oh!

TAKeanice commented Sep 21, 2025

Uh oh!

timbms commented Sep 22, 2025

Uh oh!

Uh oh!

TAKeanice commented Sep 22, 2025

Uh oh!

timbms commented Sep 22, 2025

Uh oh!

timbms commented Sep 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TAKeanice commented Sep 22, 2025

Uh oh!

timbms commented Sep 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

timbms commented Sep 22, 2025 •

edited

Loading