feat: Core/をubuntuでビルドできるように変更 (#254)

* feat: add ubuntu build ci

* ci: use swift 6.2 on ubuntu

* fix: remove unnecessary import

* fix: refactor to remove NSEvent from InputState.swift

* fix: make ubuntu-buildable

* fix: import FoundationNetworking on linux

* fix: make Core config helpers linux-friendly

* fix: disable Zenzai for testing

* fix: test case for linux

* fix: make Error Equatable

* fix: add await

Author: ensan-hcl

.github/workflows/swift.yml

@@ -22,6 +22,22 @@ jobs:
       - name: Test
         run: swift test --package-path Core
 
+  ubuntu-build:
+    name: Build and Test on Ubuntu
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Setup Swift 6.2
+        uses: swift-actions/setup-swift@v2
+        with:
+          swift-version: "6.2"
+      - name: Build
+        run: swift build --package-path Core
+      - name: Test
+        run: swift test --package-path Core
+
   xcodebuild-test:
     name: Xcodebuild test on macOS
     runs-on: macos-15

Core/Package.swift

@@ -3,6 +3,13 @@
 
 import PackageDescription
 
+#if os(macOS)
+let kanaKanjiConverterTraits: Set<Package.Dependency.Trait> = ["Zenzai"]
+#else
+// for testing in Ubuntu environment.
+let kanaKanjiConverterTraits: Set<Package.Dependency.Trait> = []
+#endif
+
 let package = Package(
     name: "Core",
     platforms: [.macOS(.v13)],
@@ -14,7 +21,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", revision: "07486b32d4e22ff76f4c2167c38d08e1eb36de9a", traits: ["Zenzai"])
+        .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", revision: "07486b32d4e22ff76f4c2167c38d08e1eb36de9a", traits: kanaKanjiConverterTraits)
     ],
     targets: [
         .executableTarget(

Core/Sources/Core/Configs/BoolConfigItem.swift

@@ -7,7 +7,7 @@ protocol BoolConfigItem: ConfigItem<Bool> {
 extension BoolConfigItem {
     public var value: Bool {
         get {
-            if let value = UserDefaults.standard.value(forKey: Self.key) {
+            if let value = UserDefaults.standard.object(forKey: Self.key) {
                 value as? Bool ?? Self.default
             } else {
                 Self.default

Core/Sources/Core/Configs/CustomCodableConfigItem.swift

@@ -209,7 +209,7 @@ extension Config {
         public static var `default`: Value {
             // Migration: If user had OpenAI API enabled, preserve that setting
             let legacyKey = Config.Deprecated.EnableOpenAiApiKey.key
-            if let legacyValue = UserDefaults.standard.value(forKey: legacyKey) as? Bool,
+            if let legacyValue = UserDefaults.standard.object(forKey: legacyKey) as? Bool,
                legacyValue {
                 return .openAI
             }

Core/Sources/Core/Configs/CustomInputTableStore.swift

@@ -1,4 +1,7 @@
 import Foundation
+#if canImport(UniformTypeIdentifiers)
+import UniformTypeIdentifiers
+#endif
 import KanaKanjiConverterModule
 
 public enum CustomInputTableStore {
@@ -15,7 +18,11 @@ public enum CustomInputTableStore {
     }
 
     static var fileURL: URL {
-        directoryURL.appendingPathComponent(fileName, conformingTo: .text)
+        #if canImport(UniformTypeIdentifiers) && !os(Linux)
+        return directoryURL.appendingPathComponent(fileName, conformingTo: .text)
+        #else
+        return directoryURL.appendingPathComponent(fileName)
+        #endif
     }
 
     @discardableResult

Core/Sources/Core/Configs/IntConfigItem.swift

@@ -7,7 +7,7 @@ protocol IntConfigItem: ConfigItem<Int> {
 extension IntConfigItem {
     public var value: Int {
         get {
-            if let value = UserDefaults.standard.value(forKey: Self.key) {
+            if let value = UserDefaults.standard.object(forKey: Self.key) {
                 value as? Int ?? Self.default
             } else {
                 Self.default

Core/Sources/Core/InputUtils/Actions/ClientAction.swift

@@ -1,4 +1,3 @@
-import InputMethodKit
 import KanaKanjiConverterModule
 
 public enum ClientAction {

Core/Sources/Core/InputUtils/InputState.swift

@@ -1,4 +1,4 @@
-import InputMethodKit
+import Foundation
 import KanaKanjiConverterModule
 
 public enum InputState: Sendable, Hashable {
@@ -10,29 +10,18 @@ public enum InputState: Sendable, Hashable {
     case replaceSuggestion
     case unicodeInput(String)
 
+    public enum ModifierFlag: Sendable, Equatable, Hashable {
+        case option
+        case control
+        case command
+        case shift
+    }
+
     public struct EventCore: Sendable, Equatable {
-        public init(modifierFlags: NSEvent.ModifierFlags) {
+        public init(modifierFlags: [ModifierFlag]) {
             self.modifierFlags = modifierFlags
         }
-        var modifierFlags: NSEvent.ModifierFlags
-    }
-
-    public func event(  // swiftlint:disable:this function_parameter_count
-        _ event: NSEvent!,
-        userAction: UserAction,
-        inputLanguage: InputLanguage,
-        liveConversionEnabled: Bool,
-        enableDebugWindow: Bool,
-        enableSuggestion: Bool
-    ) -> (ClientAction, ClientActionCallback) {
-        self.event(
-            eventCore: EventCore(modifierFlags: event.modifierFlags),
-            userAction: userAction,
-            inputLanguage: inputLanguage,
-            liveConversionEnabled: liveConversionEnabled,
-            enableDebugWindow: enableDebugWindow,
-            enableSuggestion: enableSuggestion
-        )
+        var modifierFlags: [ModifierFlag]
     }
 
     // この種のコードは複雑にしかならないので、lintを無効にする

Core/Sources/Core/MagicConversion/OpenAIClient.swift

@@ -1,4 +1,7 @@
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 struct Prompt {
     static let dictionary: [String: String] = [

Core/Sources/Core/UserDictionary/SystemUserDictionaryHelper.swift

@@ -1,7 +1,7 @@
 import Foundation
-import SQLite3
-#if canImport(AppKit)
+#if os(macOS)
 import AppKit
+import SQLite3
 #endif
 
 /// macOSのユーザ辞書データを取り出すためのヘルパー
@@ -12,7 +12,20 @@ import AppKit
 ///   sqlite3 -header -csv ~/Library/KeyboardServices/TextReplacements.db "SELECT ZSHORTCUT, ZPHRASE FROM ZTEXTREPLACEMENTENTRY"
 ///   ```
 public enum SystemUserDictionaryHelper: Sendable {
-    #if canImport(AppKit)
+    public struct Entry: Sendable {
+        public let shortcut: String
+        public let phrase: String
+    }
+
+    public enum FetchError: Sendable, Error, Equatable {
+        case unsupportedOperatingSystem
+        case fileNotExist(String)
+        case fileNotReadable(String)
+        case failedToOpenDatabase(status: Int32)
+        case failedToPrepareStatement(status: Int32)
+    }
+
+    #if os(macOS)
     /// Delegate that allows the user to choose **only** a directory named "KeyboardServices".
     private final class KeyboardServicesDirectoryDelegate: NSObject, NSOpenSavePanelDelegate {
         private let allowedFolderName = "KeyboardServices"
@@ -37,37 +50,26 @@ public enum SystemUserDictionaryHelper: Sendable {
 
     /// A shared delegate instance that remains alive for the lifetime of the open panel.
     @MainActor private static let keyboardServicesDelegate = KeyboardServicesDirectoryDelegate()
-    #endif
 
-    public struct Entry: Sendable {
-        public let shortcut: String
-        public let phrase: String
-    }
-
-    public enum FetchError: Sendable, Error {
-        case fileNotExist(String)
-        case fileNotReadable(String)
-        case failedToOpenDatabase(status: Int32)
-        case failedToPrepareStatement(status: Int32)
-    }
-
-    @MainActor static func promptUserForTextReplacementDirectory() -> URL? {
+    @MainActor private static func promptUserForTextReplacementDirectory() -> URL? {
         let panel = NSOpenPanel()
         panel.title = "システムのユーザ辞書ディレクトリ（KeyboardServices）を選択してください"
         panel.message = "システムのユーザ辞書ディレクトリ（KeyboardServices）を選択してください"
         panel.canChooseDirectories = true
         panel.canChooseFiles = false
         panel.allowsMultipleSelection = false
         panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Library/KeyboardServices")
-        #if canImport(AppKit)
         panel.delegate = keyboardServicesDelegate
-        #endif
 
         let response = panel.runModal()
         return response == .OK ? panel.url : nil
     }
+    #endif
 
     @MainActor public static func fetchEntries() throws(FetchError) -> [Entry] {
+        #if !os(macOS)
+        throw .unsupportedOperatingSystem
+        #else
         let userName = NSUserName()
         var dbPath = "/Users/\(userName)/Library/KeyboardServices/TextReplacements.db"
         guard FileManager.default.fileExists(atPath: dbPath) else {
@@ -134,5 +136,6 @@ public enum SystemUserDictionaryHelper: Sendable {
         }
 
         return entries
+        #endif
     }
 }