Swift 6

Author: eagleoflqj

CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/ios-cmake/ios.toolchain.cmak
 
 project(fcitx5-ios VERSION 0.1.0 LANGUAGES CXX Swift)
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED YES) # Need it for AppGroup even for simulator.
-set(CMAKE_Swift_LANGUAGE_VERSION 5.9)
+set(CMAKE_Swift_LANGUAGE_VERSION 6)
 set(CMAKE_CXX_STANDARD 20)
 
 set(BUNDLE_IDENTIFIER "org.fcitx.Fcitx5")

iosfrontend/iosfrontend.swift

@@ -1,8 +1,10 @@
 import FcitxProtocol
 import Foundation
 
+@MainActor
 private var client: FcitxProtocol!
 
+@MainActor
 public func setClient(_ cli: FcitxProtocol) {
   client = cli
 }

keyboard/KeyboardViewController.swift

@@ -23,12 +23,17 @@ private func syncLocale() -> String {
   return getLocale()
 }
 
+@MainActor
 class KeyboardViewController: UIInputViewController, FcitxProtocol {
   var id: UInt64!
   var hostingController: UIHostingController<VirtualKeyboardView>!
   var removedBySlide = ""
   static private var clipboardText = ""
 
+  nonisolated(unsafe) private func getId() -> UInt64 {
+    return UInt64(Int(bitPattern: Unmanaged.passUnretained(self).toOpaque()))
+  }
+
   private func updateTextIsEmpty() {
     let text =
       (textDocumentProxy.documentContextBeforeInput ?? "")
@@ -44,7 +49,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
   }
 
   override func viewDidLoad() {
-    id = UInt64(Int(bitPattern: Unmanaged.passUnretained(self).toOpaque()))
+    id = getId()
     logger.info("viewDidLoad \(self.id)")
     super.viewDidLoad()
     redirectStderr()
@@ -104,8 +109,7 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
   }
 
   deinit {
-    logger.info("deinit \(self.id)")
-    hostingController = nil
+    logger.info("deinit \(self.getId())")
   }
 
   override func viewWillLayoutSubviews() {

protocol/FcitxProtocol.swift

@@ -1,3 +1,4 @@
+@MainActor
 public protocol FcitxProtocol {
   func keyPressed(_ key: String, _ code: String)
   func forwardKey(_ key: String, _ code: String)

uipanel/KeyModifier.swift

@@ -26,6 +26,7 @@ private func getNStep(_ start: CGFloat, _ end: CGFloat, _ step: CGFloat) -> Int
   return (start < end ? 1 : -1) * Int(floor(abs(end - start) / step))
 }
 
+@MainActor
 private func clearBubble() {
   virtualKeyboardView.setBubble(0, 0, 0, 0, .clear, .light, .clear, nil, [], 0, 0)
 }
@@ -274,6 +275,7 @@ extension View {
   }
 }
 
+@MainActor
 func executeActions(_ actions: [[String: String]]) {
   for action in actions {
     if let type = action["type"] {

uipanel/VirtualKeyboard.swift

@@ -10,14 +10,18 @@ public enum DisplayMode {
   case symbol
 }
 
+@MainActor
 var client: FcitxProtocol!
 
+@MainActor
 public func setClient(_ cli: FcitxProtocol) {
   client = cli
 }
 
+@MainActor
 let vm = ViewModel()
 
+@MainActor
 class ViewModel: ObservableObject {
   @Published var mode: DisplayMode = .initial
   @Published var returnMode: DisplayMode = .initial  // or .candidates
@@ -279,8 +283,10 @@ public struct VirtualKeyboardView: View {
   }
 }
 
+@MainActor
 public var virtualKeyboardView: VirtualKeyboardView!
 
+@MainActor
 public func newVirtualKeyboardView() -> VirtualKeyboardView {
   virtualKeyboardView = VirtualKeyboardView()
   return virtualKeyboardView

uipanel/height.swift

@@ -17,14 +17,17 @@ enum KeyboardState {
   case floating
 }
 
+@MainActor
 private var isFloating = false
 
+@MainActor
 func setFloating(_ width: CGFloat) {
   isFloating =
     (UIScreen.main.bounds.width >= 1000 || UIScreen.main.bounds.height > 1000)
     && width < UIScreen.main.bounds.width && width < UIScreen.main.bounds.height
 }
 
+@MainActor
 func getKeyboardState() -> KeyboardState {
   if isFloating {
     return .floating
@@ -35,6 +38,7 @@ func getKeyboardState() -> KeyboardState {
   return .landscape
 }
 
+@MainActor
 func getDefaultTotalHeight() -> CGFloat {
   switch getKeyboardState() {
   case .portrait:

uipanel/keyboardui.swift

@@ -19,7 +19,7 @@ public func scrollAsync(_ candidates: [String], _ end: Bool) {
   }
 }
 
-public struct StatusAreaAction: Identifiable {
+public struct StatusAreaAction: Identifiable, Sendable {
   public let id: Int32
   let desc: String
   let icon: String