Merge pull request #156 from uhooi/release/1.6.0

release/1.6.0
uhooi · May 7, 2023 · 4e69b04 · 4e69b04
2 parents 6cfb4ec + 9082692
commit 4e69b04
Show file tree

Hide file tree

Showing 56 changed files with 20 additions and 16 deletions.
diff --git a/App/Catalog.xcodeproj/project.pbxproj b/App/Catalog.xcodeproj/project.pbxproj
@@ -123,11 +123,12 @@
 			};
 			buildConfigurationList = 4B70E9AD2998749100D55B7B /* Build configuration list for PBXProject "Catalog" */;
 			compatibilityVersion = "Xcode 14.0";
-			developmentRegion = en;
+			developmentRegion = ja;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
+				ja,
 			);
 			mainGroup = 4B70E9A92998749100D55B7B;
 			productRefGroup = 4B70E9B32998749100D55B7B /* Products */;
@@ -213,7 +214,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -267,7 +267,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;

diff --git a/App/Develop.xcodeproj/project.pbxproj b/App/Develop.xcodeproj/project.pbxproj
@@ -116,7 +116,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1420;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					4B70E97129912DEA00D55B7B = {
 						CreatedOnToolsVersion = 14.2;
@@ -170,6 +170,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -216,7 +217,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -230,6 +230,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -270,7 +271,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -288,6 +288,7 @@
 				CODE_SIGN_ENTITLEMENTS = Loki/Develop/Resources/Develop.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Loki/Develop/Resources/Preview Content\"";
 				DEVELOPMENT_TEAM = 47E56DYP3N;
 				ENABLE_PREVIEWS = YES;
@@ -304,7 +305,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.theuhooi.Loki-Develop";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -325,6 +326,7 @@
 				CODE_SIGN_ENTITLEMENTS = Loki/Develop/Resources/Develop.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Loki/Develop/Resources/Preview Content\"";
 				DEVELOPMENT_TEAM = 47E56DYP3N;
 				ENABLE_PREVIEWS = YES;
@@ -341,7 +343,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.theuhooi.Loki-Develop";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

diff --git a/App/Production.xcodeproj/project.pbxproj b/App/Production.xcodeproj/project.pbxproj
@@ -309,7 +309,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.5.1;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theuhooi.Loki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -353,7 +353,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.5.1;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theuhooi.Loki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

diff --git a/App/Production.xcodeproj/xcshareddata/xcschemes/Production.xcscheme b/App/Production.xcodeproj/xcshareddata/xcschemes/Production.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_2/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Dark/SakatsuList_Japanese.png.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Dark/SakatsuList_Japanese.png.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_2/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_2/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_2/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_2/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_2/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_2/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_2/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_2/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_2/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_2/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_2/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_2/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_2/Light/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Dark/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Dark/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Dark/SakatsuSettings_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuInput_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuList_Japanese.png
diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuSettings_Japanese.png
diff --git a/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loki.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maiyama18/LicensesPlugin",
       "state" : {
-        "revision" : "c44414ad9c49f7d38309522ba8b23f63865f56b7",
-        "version" : "0.1.0"
+        "revision" : "e7dbcda9f67fdd747c16244f97070a009205e814",
+        "version" : "0.1.5"
       }
     },
     {

diff --git a/LokiPackage/Package.swift b/LokiPackage/Package.swift
@@ -57,7 +57,7 @@ let package = Package(
         //        .package(url: "https://github.com/realm/SwiftLint.git", from: "0.50.3"), // TODO: Use Command Plugins
         .package(url: "https://github.com/uhooi/SwiftLint.git", branch: "feature/add_command_plugin"), // TODO: Remove
         .package(url: "https://github.com/SwiftGen/SwiftGenPlugin.git", from: "6.6.2"),
-        .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.1.0"),
+        .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.1.5"),
     ],
     targets: [
         // App layer

diff --git a/README.md b/README.md
@@ -24,13 +24,13 @@ Loki（ロキ）は、サ活の記録に特化したアプリです。
 
 |サ活一覧|サ活登録|設定|
 |:--:|:--:|:--:|
-|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuList_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuInput_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_2/Light/SakatsuSettings_Japanese.png" width="207">|
+|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png" width="207">|
 
 ### ダーク
 
 |サ活一覧|サ活登録|設定|
 |:--:|:--:|:--:|
-|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuList_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuInput_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_2/Dark/SakatsuSettings_Japanese.png" width="207">|
+|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuList_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png" width="207">|<img src="./Docs/Screenshots/iPhone11ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png" width="207">|
 
 </details>
 

diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# ref: https://forums.swift.org/t/telling-xcode-14-beta-4-to-trust-build-tool-plugins-programatically/59305/7
+defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool true