k-taro56 · k-taro56 · Feb 21, 2024 · Feb 22, 2024 · Feb 29, 2024 · Feb 29, 2024
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,95 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+  schedule:
+    - cron: '32 19 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: python
+          build-mode: none
+        - language: swift
+          build-mode: manual
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      run: |
+        xcodebuild build -project azooKey.xcodeproj \
+                   -scheme MainApp \
+                   -sdk iphoneos \
+                   -configuration Release \
+                   CODE_SIGNING_ALLOWED=NO
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: macos-latest
 
     steps: 
-    - uses: swift-actions/setup-swift@cdbe0f7f4c77929b6580e71983e8606e55ffe7e4
+    - uses: swift-actions/setup-swift@e1dca7c4a36344146bbc2803f0d538462477bb37
       with:
         swift-version: "5.9"
 

diff --git a/.github/workflows/upload-build.yml b/.github/workflows/upload-build.yml
@@ -5,6 +5,7 @@
 name: Upload build to App Store Connect
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - develop

diff --git a/AzooKeyCore/Package.swift b/AzooKeyCore/Package.swift
@@ -46,7 +46,7 @@ let package = Package(
         // MARK: `_: .upToNextMinor(Version)` or `exact: Version` or `revision: Version`.
         // MARK: For develop branch, you can use `revision:` specification.
         // MARK: For main branch, you must use `upToNextMinor` specification.
-        .package(url: "https://github.com/ensan-hcl/AzooKeyKanaKanjiConverter", .upToNextMinor(from: "0.5.0"))
+        .package(url: "https://github.com/ensan-hcl/AzooKeyKanaKanjiConverter", .upToNextMinor(from: "0.7.0"))
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

diff --git a/AzooKeyCore/README.md b/AzooKeyCore/README.md
@@ -11,7 +11,7 @@ Keyboardの着せ替えデータ(`ThemeData`)に関するモジュールです
 
 ## KeyboardViews
 
-KeyboardのViewを実装したモジュールです最小で以下のように利用できます。
+KeyboardのViewを実装したモジュールです。最小で以下のように利用できます。
 
 ```swift
 var body: some View {

diff --git a/AzooKeyCore/Sources/AzooKeyUtils/AppVersion.swift b/AzooKeyCore/Sources/AzooKeyUtils/AppVersion.swift
@@ -0,0 +1,79 @@
+//
+//  AppVersion.swift
+//  azooKey
+//
+//  Created by ensan on 2022/07/02.
+//  Copyright © 2022 ensan. All rights reserved.
+//
+
+import Foundation
+
+/// AppVersion is a struct that represents a version of an app.
+/// It is a wrapper of String that conforms to Codable, Equatable, Comparable, Hashable, LosslessStringConvertible, CustomStringConvertible.
+/// It is initialized with a string that represents a version of an app.
+/// The string must be in the format of "major.minor.patch".
+/// The string must not contain any other characters than numbers and dots.
+public struct AppVersion: Codable, Equatable, Comparable, Hashable, LosslessStringConvertible, CustomStringConvertible, Sendable {
+
+    /// ParseError is an enum that represents an error that occurs when parsing a string to an AppVersion.
+    private enum ParseError: Error {
+        case nonIntegerValue
+    }
+
+    /// Initializes an AppVersion with a string that represents a version of an app.
+    public init?(_ description: String) {
+        if let versionSequence = try? description.split(separator: ".").map({ (value: Substring) throws -> Int in
+            guard let value = Int(value) else { throw ParseError.nonIntegerValue }
+            return value
+        }) {
+            if versionSequence.count < 1 {
+                self.majorVersion = 0
+            } else {
+                self.majorVersion = versionSequence[0]
+            }
+
+            if versionSequence.count < 2 {
+                self.minorVersion = 0
+            } else {
+                self.minorVersion = versionSequence[1]
+            }
+
+            if versionSequence.count < 3 {
+                self.patchVersion = 0
+            } else {
+                self.patchVersion = versionSequence[2]
+            }
+        } else {
+            return nil
+        }
+    }
+
+    /// Compares two AppVersions.
+    public static func < (lhs: AppVersion, rhs: AppVersion) -> Bool {
+        for (l, r) in zip([lhs.majorVersion, lhs.minorVersion, lhs.patchVersion], [rhs.majorVersion, rhs.minorVersion, rhs.patchVersion]) {
+            if l == r {
+                continue
+            }
+            return l < r
+        }
+        return false
+    }
+
+    public var majorVersion: Int
+    public var minorVersion: Int
+    public var patchVersion: Int
+
+    public var description: String {
+        "\(majorVersion).\(minorVersion).\(patchVersion)"
+    }
+}
+public extension AppVersion {
+    static let azooKey_v2_2_3 = AppVersion("2.2.3")!
+    static let azooKey_v2_2_2 = AppVersion("2.2.2")!
+    static let azooKey_v2_0_2 = AppVersion("2.0.2")!
+    static let azooKey_v1_9 = AppVersion("1.9")!
+    static let azooKey_v1_8_1 = AppVersion("1.8.1")!
+    static let azooKey_v1_8 = AppVersion("1.8")!
+    static let azooKey_v1_7_2 = AppVersion("1.7.2")!
+    static let azooKey_v1_7_1 = AppVersion("1.7.1")!
+}
diff --git a/AzooKeyCore/Sources/AzooKeyUtils/KeyboardSetting/KeyboardSetting.swift b/AzooKeyCore/Sources/AzooKeyUtils/KeyboardSetting/KeyboardSetting.swift
@@ -16,10 +16,9 @@ protocol Savable {
 }
 
 @propertyWrapper
-@MainActor
 public struct KeyboardSetting<T: KeyboardSettingKey> {
     public init(_ key: T) {}
-    public var wrappedValue: T.Value {
+    @MainActor public var wrappedValue: T.Value {
         get {
             T.value
         }

diff --git a/AzooKeyCore/Sources/AzooKeyUtils/SharedStore.swift b/AzooKeyCore/Sources/AzooKeyUtils/SharedStore.swift
@@ -82,14 +82,3 @@ public enum SharedStore {
         }
     }
 }
-
-public extension AppVersion {
-    static let azooKey_v2_2_3 = AppVersion("2.2.3")!
-    static let azooKey_v2_2_2 = AppVersion("2.2.2")!
-    static let azooKey_v2_0_2 = AppVersion("2.0.2")!
-    static let azooKey_v1_9 = AppVersion("1.9")!
-    static let azooKey_v1_8_1 = AppVersion("1.8.1")!
-    static let azooKey_v1_8 = AppVersion("1.8")!
-    static let azooKey_v1_7_2 = AppVersion("1.7.2")!
-    static let azooKey_v1_7_1 = AppVersion("1.7.1")!
-}
diff --git a/AzooKeyCore/Sources/KeyboardExtensionUtils/DisplayedTextManager.swift b/AzooKeyCore/Sources/KeyboardExtensionUtils/DisplayedTextManager.swift
@@ -11,7 +11,7 @@ import SwiftUtils
 import UIKit
 
 /// UI側の入力中のテキストの更新を受け持つクラス
-@MainActor final public class DisplayedTextManager {
+final public class DisplayedTextManager {
     public init(isLiveConversionEnabled: Bool, isMarkedTextEnabled: Bool) {
         self.isLiveConversionEnabled = isLiveConversionEnabled
         self.isMarkedTextEnabled = isMarkedTextEnabled
@@ -61,15 +61,15 @@ import UIKit
         }
     }
 
-    public var documentContextAfterInput: String? {
+    @MainActor public var documentContextAfterInput: String? {
         self.proxy?.documentContextAfterInput
     }
 
-    public var selectedText: String? {
+    @MainActor public var selectedText: String? {
         self.proxy?.selectedText
     }
 
-    public var documentContextBeforeInput: String? {
+    @MainActor public var documentContextBeforeInput: String? {
         self.proxy?.documentContextBeforeInput
     }
 
@@ -101,7 +101,7 @@ import UIKit
     }
 
     /// カーソルを何カウント分動かせばいいか計算する
-    private func getActualOffset(count: Int) -> Int {
+    @MainActor private func getActualOffset(count: Int) -> Int {
         if count == 0 {
             return 0
         } else if count > 0 {
@@ -127,13 +127,13 @@ import UIKit
 
     /// MarkedTextを更新する関数
     /// この関数自体はisMarkedTextEnabledのチェックを行わない。
-    private func updateMarkedText() {
+    @MainActor private func updateMarkedText() {
         let text = self.displayedLiveConversionText ?? self.composingText.convertTarget
         let cursorPosition = self.displayedLiveConversionText.map(NSString.init(string:))?.length ?? NSString(string: String(self.composingText.convertTarget.prefix(self.composingText.convertTargetCursorPosition))).length
         self.proxy?.setMarkedText(text, selectedRange: NSRange(location: cursorPosition, length: 0))
     }
 
-    public func insertText(_ text: String) {
+    @MainActor public func insertText(_ text: String) {
         guard !text.isEmpty else {
             return
         }
@@ -142,15 +142,15 @@ import UIKit
     }
 
     /// In-Keyboard TextFiledが用いられていても、そちらではない方に強制的に入力を行う関数
-    public func insertMainDisplayText(_ text: String) {
+    @MainActor public func insertMainDisplayText(_ text: String) {
         guard !text.isEmpty else {
             return
         }
         self.displayedTextProxy?.insertText(text)
         self.textChangedCount += 1
     }
 
-    public func moveCursor(count: Int) {
+    @MainActor public func moveCursor(count: Int) {
         guard count != 0 else {
             return
         }
@@ -160,7 +160,7 @@ import UIKit
     }
 
     // ただ与えられた回数の削除を実行する関数
-    private func rawDeleteBackward(count: Int = 1) {
+    @MainActor private func rawDeleteBackward(count: Int = 1) {
         guard count != 0 else {
             return
         }
@@ -172,7 +172,7 @@ import UIKit
 
     // isComposingの場合、countはadjust済みであることを期待する
     // されていなかった場合は例外を投げる
-    public func deleteBackward(count: Int) {
+    @MainActor public func deleteBackward(count: Int) {
         if count == 0 {
             return
         }
@@ -186,7 +186,7 @@ import UIKit
     // ただ与えられた回数の削除を入力方向に実行する関数
     // カーソルが動かせない場合を検知するために工夫を入れている
     // TODO: iOS16以降のテキストフィールドの仕様変更で動かなくなっている。直す必要があるが、どうしようもない気がしている。
-    private func rawDeleteForward(count: Int) {
+    @MainActor private func rawDeleteForward(count: Int) {
         guard count != 0 else {
             return
         }
@@ -205,7 +205,7 @@ import UIKit
 
     // isComposingの場合、countはadjust済みであることを期待する
     // されていなかった場合は例外を投げる
-    public func deleteForward(count: Int = 1) {
+    @MainActor public func deleteForward(count: Int = 1) {
         if count == 0 {
             return
         }
@@ -217,7 +217,7 @@ import UIKit
     }
 
     /// `composingText`を更新する
-    public func updateComposingText(composingText: ComposingText, newLiveConversionText: String?) {
+    @MainActor public func updateComposingText(composingText: ComposingText, newLiveConversionText: String?) {
         if isMarkedTextEnabled {
             self.composingText = composingText
             self.displayedLiveConversionText = newLiveConversionText
@@ -244,7 +244,7 @@ import UIKit
         }
     }
 
-    public func updateComposingText(composingText: ComposingText, userMovedCount: Int, adjustedMovedCount: Int) -> Bool {
+    @MainActor public func updateComposingText(composingText: ComposingText, userMovedCount: Int, adjustedMovedCount: Int) -> Bool {
         let delta = adjustedMovedCount - userMovedCount
         self.composingText = composingText
         if delta != 0 {
@@ -255,7 +255,7 @@ import UIKit
         return false
     }
 
-    public func updateComposingText(composingText: ComposingText, completedPrefix: String, isSelected: Bool) {
+    @MainActor public func updateComposingText(composingText: ComposingText, completedPrefix: String, isSelected: Bool) {
         if isMarkedTextEnabled {
             self.insertText(completedPrefix)
             self.composingText = composingText

diff --git a/AzooKeyCore/Sources/KeyboardViews/InternalSettings/EmojiTabExpandModePreference.swift b/AzooKeyCore/Sources/KeyboardViews/InternalSettings/EmojiTabExpandModePreference.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import SwiftUtils
+import SwiftUIUtils
 
 /// 絵文字等のタブで、表示する文字に関する設定を記述する
 public struct EmojiTabExpandModePreference: Codable, StaticInitialValueAvailable {

diff --git a/AzooKeyCore/Sources/KeyboardViews/InternalSettings/KeyboardInternalSettingManager.swift b/AzooKeyCore/Sources/KeyboardViews/InternalSettings/KeyboardInternalSettingManager.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import SwiftUtils
+import SwiftUIUtils
 
 public struct KeyboardInternalSettingManager: UserDefaultsManager {
     public var userDefaults: UserDefaults

diff --git a/AzooKeyCore/Sources/KeyboardViews/InternalSettings/OneHandedModeSetting.swift b/AzooKeyCore/Sources/KeyboardViews/InternalSettings/OneHandedModeSetting.swift
@@ -9,6 +9,7 @@
 import Foundation
 import SwiftUI
 import SwiftUtils
+import SwiftUIUtils
 
 public struct OneHandedModeSetting: Codable, StaticInitialValueAvailable {
     public static let initialValue = Self()
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     name: Upload build to App Store Connect
     on:
+      workflow_dispatch:
       push:
         branches:
           - develop
@@ Expand Down @@