Merge branch 'uhooi:main' into features/add-privacy-manifests

.github/workflows/ci.yml

@@ -19,20 +19,20 @@ permissions:
   contents: read
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app
+  DEVELOPER_DIR: /Applications/Xcode_15.2.app
 
 jobs:
   build:
     name: Build for ${{ matrix.project }}
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
         project: ["production", "develop"]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build for ${{ matrix.project }}
         run: make build-debug-${{ matrix.project }}

.gitignore

@@ -94,3 +94,7 @@ iOSInjectionProject/
 
 # Mint
 .mint/
+
+# xcodebuild.nvim
+.nvim/xcodebuild/*.log
+.nvim/xcodebuild/report.json

.nvim/xcodebuild/settings.json

@@ -0,0 +1 @@
+{"projectCommand": "-workspace '/Users/uhooi/ghq/github.com/uhooi/Loki/Loki.xcworkspace'", "deviceName": "iPhone 15 Pro Max", "productName": "Develop", "projectFile": "/Users/uhooi/ghq/github.com/uhooi/Loki/Loki.xcworkspace", "config": "Debug", "appPath": "/Users/uhooi/Library/Developer/Xcode/DerivedData/Loki-dchlwzwhdangfcbztrbvmxadmexs/Build/Products/Debug-iphonesimulator/Develop.app", "platform": "iOS Simulator", "destination": "C1DF7E9D-20A3-4544-BC85-EF6F49184399", "bundleId": "com.theuhooi.Loki-Develop", "scheme": "Develop", "os": "17.2", "lastBuildTime": 12}

App/Develop.xcodeproj/project.pbxproj

@@ -323,6 +323,7 @@
 				DEVELOPMENT_ASSET_PATHS = "\"Loki/Develop/Resources/Preview Content\"";
 				DEVELOPMENT_TEAM = 47E56DYP3N;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "Dev-Loki";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -336,7 +337,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.7.0;
+				MARKETING_VERSION = 1.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.theuhooi.Loki-Develop";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -374,7 +375,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.7.0;
+				MARKETING_VERSION = 1.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.theuhooi.Loki-Develop";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

App/Develop.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4B70E97129912DEA00D55B7B"
+               BuildableName = "Develop.app"
+               BlueprintName = "Develop"
+               ReferencedContainer = "container:Develop.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4B70E97129912DEA00D55B7B"
+            BuildableName = "Develop.app"
+            BlueprintName = "Develop"
+            ReferencedContainer = "container:Develop.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4B70E97129912DEA00D55B7B"
+            BuildableName = "Develop.app"
+            BlueprintName = "Develop"
+            ReferencedContainer = "container:Develop.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

App/Production.xcodeproj/project.pbxproj

@@ -317,7 +317,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.7.0;
+				MARKETING_VERSION = 1.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theuhooi.Loki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -361,7 +361,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.7.0;
+				MARKETING_VERSION = 1.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theuhooi.Loki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

LokiPackage/Sources/Features/Sakatsu/SakatsuList/SakatsuListScreen.swift

@@ -21,11 +21,14 @@ package struct SakatsuListScreen: View {
             }
         )
         .navigationTitle(String(localized: "Sakatsu list", bundle: .module))
-        .searchable(text: .init(get: {
-            viewModel.uiState.searchText
-        }, set: { newValue in
-            viewModel.send(.onSearchTextChange(searchText: newValue))
-        }))
+        .searchable(
+            text: .init(get: {
+                viewModel.uiState.searchText
+            }, set: { newValue in
+                viewModel.send(.onSearchTextChange(searchText: newValue))
+            }),
+            placement: .navigationBarDrawer(displayMode: .always)
+        )
         .sakatsuListScreenToolbar(
             editMode: $editMode,
             colorScheme: colorScheme,

LokiPackage/Sources/Features/Settings/Resources/Localizable.xcstrings

@@ -1,12 +1,12 @@
 {
   "sourceLanguage" : "ja",
   "strings" : {
-    "© 2023 THE Uhooi" : {
+    "© 2024 THE Uhooi" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "© 2023 THE Uhooi"
+            "value" : "© 2024 THE Uhooi"
           }
         }
       }
@@ -173,4 +173,4 @@
     }
   },
   "version" : "1.0"
-}
+}

LokiPackage/Sources/Features/Settings/Settings/SettingsView.swift

@@ -62,7 +62,7 @@ private extension SettingsView {
                 value: "\(Bundle.main.version) (\(Bundle.main.build))"
             )
         } footer: {
-            Text("© 2023 THE Uhooi", bundle: .module)
+            Text("© 2024 THE Uhooi", bundle: .module)
         }
     }
 

Makefile

@@ -17,9 +17,7 @@ develop_log_name := $(product_name)_$(develop_project_name)_Build.log
 TEST_SDK := iphonesimulator
 TEST_CONFIGURATION := Debug
 TEST_PLATFORM := iOS Simulator
-TEST_DEVICE ?= iPhone 14 Pro Max
-TEST_OS ?= 17.0
-TEST_DESTINATION := 'platform=$(TEST_PLATFORM),name=$(TEST_DEVICE),OS=$(TEST_OS)'
+TEST_DESTINATION := 'generic/platform=$(TEST_PLATFORM)'
 
 # Commands
 MINT := mint

README.md

@@ -41,7 +41,7 @@ Loki（ロキ）は、サ活の記録に特化したアプリです。
 ### 必要条件
 
 - macOS 13.5+
-- Xcode 15.0 (Swift 5.9)
+- Xcode 15.2 (Swift 5.9.2)
 - Make
 - Mint