Skip to content

Commit 6ab772c

Browse files
Lakr233Lakr233
committed
Update Build & Fix Menu Error
1 parent 499a990 commit 6ab772c

File tree

12 files changed

+103
-736
lines changed

12 files changed

+103
-736
lines changed

‎Kimis.xcodeproj/project.pbxproj‎

Lines changed: 51 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
503809AD2977B7B3004C9438 /* FollowingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503809AC2977B7B3004C9438 /* FollowingController.swift */; };
4747
503809AF2977BA46004C9438 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503809AE2977BA46004C9438 /* ViewController.swift */; };
4848
503809B12977D27E004C9438 /* CGPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503809B02977D27E004C9438 /* CGPoint.swift */; };
49-
503A833C2AB40DE500D240D3 /* ChidoriMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503A83382AB40DE500D240D3 /* ChidoriMenu.swift */; };
50-
503A833D2AB40DE500D240D3 /* ChidoriMenuTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503A83392AB40DE500D240D3 /* ChidoriMenuTableViewCell.swift */; };
51-
503A833E2AB40DE500D240D3 /* ChidoriAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503A833A2AB40DE500D240D3 /* ChidoriAnimationController.swift */; };
52-
503A833F2AB40DE500D240D3 /* ChidoriPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503A833B2AB40DE500D240D3 /* ChidoriPresentationController.swift */; };
5349
50443F862927B9190077523F /* Source in Frameworks */ = {isa = PBXBuildFile; productRef = 50443F852927B9190077523F /* Source */; };
5450
50443F8A2927D4E10077523F /* NoteCell+Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50443F892927D4E10077523F /* NoteCell+Context.swift */; };
5551
50443F8F2927D5050077523F /* NotePreviewSimple.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50443F8E2927D5050077523F /* NotePreviewSimple.swift */; };
@@ -258,6 +254,7 @@
258254
50E8DFD5297B19C600657910 /* PaddedTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E8DFD4297B19C600657910 /* PaddedTextField.swift */; };
259255
50E8DFD8297B433100657910 /* LicenseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E8DFD7297B433100657910 /* LicenseController.swift */; };
260256
50E8DFDC297B43C500657910 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 50E8DFDB297B43C500657910 /* LICENSE */; };
257+
50F922B82E8AD95200D1E2C1 /* ChidoriMenu in Frameworks */ = {isa = PBXBuildFile; productRef = 50F922B72E8AD95200D1E2C1 /* ChidoriMenu */; };
261258
50FAC1F32A651B4000125B2A /* ReactionStrip+BaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FAC1F22A651B4000125B2A /* ReactionStrip+BaseView.swift */; };
262259
50FD825B29757AC300738C27 /* TextParser+RegEx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FD825A29757AC300738C27 /* TextParser+RegEx.swift */; };
263260
50FE1B1229336250000CE139 /* HashtagNoteController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50FE1B1129336250000CE139 /* HashtagNoteController.swift */; };
@@ -309,10 +306,6 @@
309306
503809AC2977B7B3004C9438 /* FollowingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowingController.swift; sourceTree = "<group>"; };
310307
503809AE2977BA46004C9438 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
311308
503809B02977D27E004C9438 /* CGPoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGPoint.swift; sourceTree = "<group>"; };
312-
503A83382AB40DE500D240D3 /* ChidoriMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChidoriMenu.swift; sourceTree = "<group>"; };
313-
503A83392AB40DE500D240D3 /* ChidoriMenuTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChidoriMenuTableViewCell.swift; sourceTree = "<group>"; };
314-
503A833A2AB40DE500D240D3 /* ChidoriAnimationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChidoriAnimationController.swift; sourceTree = "<group>"; };
315-
503A833B2AB40DE500D240D3 /* ChidoriPresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChidoriPresentationController.swift; sourceTree = "<group>"; };
316309
50443F892927D4E10077523F /* NoteCell+Context.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NoteCell+Context.swift"; sourceTree = "<group>"; };
317310
50443F8E2927D5050077523F /* NotePreviewSimple.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotePreviewSimple.swift; sourceTree = "<group>"; };
318311
50443F902927D78A0077523F /* NotePreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotePreview.swift; sourceTree = "<group>"; };
@@ -539,6 +532,7 @@
539532
5011D503293B477C0088173F /* IDNA in Frameworks */,
540533
505318F6297EAC07005E30DE /* KeychainAccess in Frameworks */,
541534
50443F862927B9190077523F /* Source in Frameworks */,
535+
50F922B82E8AD95200D1E2C1 /* ChidoriMenu in Frameworks */,
542536
50BED21729277E0600C9D7E2 /* MorphingLabel in Frameworks */,
543537
50A4EC90297E14D600F9E0A3 /* Bugsnag in Frameworks */,
544538
50BED22029277EC200C9D7E2 /* SDWebImage in Frameworks */,
@@ -647,17 +641,6 @@
647641
path = FollowingController;
648642
sourceTree = "<group>";
649643
};
650-
503A83372AB40DDB00D240D3 /* Menu */ = {
651-
isa = PBXGroup;
652-
children = (
653-
503A83382AB40DE500D240D3 /* ChidoriMenu.swift */,
654-
503A83392AB40DE500D240D3 /* ChidoriMenuTableViewCell.swift */,
655-
503A833B2AB40DE500D240D3 /* ChidoriPresentationController.swift */,
656-
503A833A2AB40DE500D240D3 /* ChidoriAnimationController.swift */,
657-
);
658-
path = Menu;
659-
sourceTree = "<group>";
660-
};
661644
50443F8B2927D4E60077523F /* Abstract */ = {
662645
isa = PBXGroup;
663646
children = (
@@ -1061,7 +1044,6 @@
10611044
50BED14829277D0D00C9D7E2 /* Extension */ = {
10621045
isa = PBXGroup;
10631046
children = (
1064-
503A83372AB40DDB00D240D3 /* Menu */,
10651047
50BED15E29277D0E00C9D7E2 /* Generic */,
10661048
508FE990292B43E8005D1933 /* Module */,
10671049
50BED14929277D0D00C9D7E2 /* Property */,
@@ -1504,6 +1486,7 @@
15041486
5011D502293B477C0088173F /* IDNA */,
15051487
50A4EC8F297E14D600F9E0A3 /* Bugsnag */,
15061488
505318F5297EAC07005E30DE /* KeychainAccess */,
1489+
50F922B72E8AD95200D1E2C1 /* ChidoriMenu */,
15071490
);
15081491
productName = Kimis;
15091492
productReference = 50BED13029277CDE00C9D7E2 /* Kimis.app */;
@@ -1517,7 +1500,7 @@
15171500
attributes = {
15181501
BuildIndependentTargetsInParallel = 1;
15191502
LastSwiftUpdateCheck = 1410;
1520-
LastUpgradeCheck = 1410;
1503+
LastUpgradeCheck = 2600;
15211504
TargetAttributes = {
15221505
50BED12F29277CDE00C9D7E2 = {
15231506
CreatedOnToolsVersion = 14.1;
@@ -1544,6 +1527,7 @@
15441527
5011D501293B477C0088173F /* XCRemoteSwiftPackageReference "IDNA-Cocoa" */,
15451528
50A4EC8E297E14D600F9E0A3 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */,
15461529
505318F4297EAC07005E30DE /* XCRemoteSwiftPackageReference "KeychainAccess" */,
1530+
50F922B62E8AD95200D1E2C1 /* XCRemoteSwiftPackageReference "ChidoriMenu" */,
15471531
);
15481532
productRefGroup = 50BED13129277CDE00C9D7E2 /* Products */;
15491533
projectDirPath = "";
@@ -1685,15 +1669,13 @@
16851669
503809AB2977B7AC004C9438 /* FollowerController.swift in Sources */,
16861670
50BED1C029277D0E00C9D7E2 /* UIImage+Fluent.swift in Sources */,
16871671
50BED1DB29277D0E00C9D7E2 /* NoteCell+Full.swift in Sources */,
1688-
503A833F2AB40DE500D240D3 /* ChidoriPresentationController.swift in Sources */,
16891672
50126257292F78D6002E1636 /* Collection.swift in Sources */,
16901673
5045198F296C21F7009D613D /* AttachmentDrivePicker+Cell.swift in Sources */,
16911674
50BED1D829277D0E00C9D7E2 /* NoteCell+MoreHeader.swift in Sources */,
16921675
502015F5296FFB1600C57E39 /* AttachmentDrivePicker+Delegate.swift in Sources */,
16931676
504519A5296D55EC009D613D /* Toolbar+Picture.swift in Sources */,
16941677
504519A7296D55EC009D613D /* Toolbar+Poll.swift in Sources */,
16951678
50BED1FA29277D0E00C9D7E2 /* SceneDelegate.swift in Sources */,
1696-
503A833D2AB40DE500D240D3 /* ChidoriMenuTableViewCell.swift in Sources */,
16971679
50BED1BD29277D0E00C9D7E2 /* UIImage+BlurHash.swift in Sources */,
16981680
504E87D629377B4E00BDE03C /* NotificationCell+Kind.swift in Sources */,
16991681
50E8DFD8297B433100657910 /* LicenseController.swift in Sources */,
@@ -1787,11 +1769,9 @@
17871769
505826242935004700E72238 /* UserViewController+Scroll.swift in Sources */,
17881770
50FF63EC2969A46700DBB4CA /* UIButton.swift in Sources */,
17891771
50443F8A2927D4E10077523F /* NoteCell+Context.swift in Sources */,
1790-
503A833C2AB40DE500D240D3 /* ChidoriMenu.swift in Sources */,
17911772
50BED1BF29277D0E00C9D7E2 /* AlignedCollectionViewFlowLayout.swift in Sources */,
17921773
5069EBB2295EDD3100677A3F /* SmallUsersListController.swift in Sources */,
17931774
50BED1C229277D0E00C9D7E2 /* TextView.swift in Sources */,
1794-
503A833E2AB40DE500D240D3 /* ChidoriAnimationController.swift in Sources */,
17951775
5065E4E429352B22001C540C /* TextParser+Email.swift in Sources */,
17961776
50BED20329277D0E00C9D7E2 /* TextParser+Body.swift in Sources */,
17971777
50CEBEBC2A6A455900484FD8 /* UserSimpleBannerView.swift in Sources */,
@@ -1829,6 +1809,7 @@
18291809
isa = XCBuildConfiguration;
18301810
buildSettings = {
18311811
ALWAYS_SEARCH_USER_PATHS = NO;
1812+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
18321813
CLANG_ANALYZER_NONNULL = YES;
18331814
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
18341815
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -1859,8 +1840,10 @@
18591840
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
18601841
COPY_PHASE_STRIP = NO;
18611842
DEBUG_INFORMATION_FORMAT = dwarf;
1843+
DEVELOPMENT_TEAM = 964G86XT2P;
18621844
ENABLE_STRICT_OBJC_MSGSEND = YES;
18631845
ENABLE_TESTABILITY = YES;
1846+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
18641847
GCC_C_LANGUAGE_STANDARD = gnu11;
18651848
GCC_DYNAMIC_NO_PIC = NO;
18661849
GCC_NO_COMMON_BLOCKS = YES;
@@ -1880,6 +1863,7 @@
18801863
MTL_FAST_MATH = YES;
18811864
ONLY_ACTIVE_ARCH = YES;
18821865
SDKROOT = iphoneos;
1866+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
18831867
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
18841868
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
18851869
};
@@ -1889,6 +1873,7 @@
18891873
isa = XCBuildConfiguration;
18901874
buildSettings = {
18911875
ALWAYS_SEARCH_USER_PATHS = NO;
1876+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
18921877
CLANG_ANALYZER_NONNULL = YES;
18931878
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
18941879
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -1919,8 +1904,10 @@
19191904
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
19201905
COPY_PHASE_STRIP = NO;
19211906
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1907+
DEVELOPMENT_TEAM = 964G86XT2P;
19221908
ENABLE_NS_ASSERTIONS = NO;
19231909
ENABLE_STRICT_OBJC_MSGSEND = YES;
1910+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
19241911
GCC_C_LANGUAGE_STANDARD = gnu11;
19251912
GCC_NO_COMMON_BLOCKS = YES;
19261913
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1933,6 +1920,7 @@
19331920
MTL_ENABLE_DEBUG_INFO = NO;
19341921
MTL_FAST_MATH = YES;
19351922
SDKROOT = iphoneos;
1923+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
19361924
SWIFT_COMPILATION_MODE = wholemodule;
19371925
SWIFT_OPTIMIZATION_LEVEL = "-O";
19381926
VALIDATE_PRODUCT = YES;
@@ -1942,18 +1930,28 @@
19421930
50BED14529277CDF00C9D7E2 /* Debug */ = {
19431931
isa = XCBuildConfiguration;
19441932
buildSettings = {
1933+
ARCHS = arm64;
19451934
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
19461935
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
19471936
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
19481937
CODE_SIGN_ENTITLEMENTS = Kimis/KimisDebug.entitlements;
19491938
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
19501939
CODE_SIGN_STYLE = Automatic;
19511940
CURRENT_PROJECT_VERSION = 165;
1952-
DEVELOPMENT_TEAM = 6CMYQQFFT8;
1941+
ENABLE_APP_SANDBOX = YES;
1942+
ENABLE_ENHANCED_SECURITY = YES;
19531943
"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
1944+
ENABLE_INCOMING_NETWORK_CONNECTIONS = YES;
1945+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
1946+
ENABLE_POINTER_AUTHENTICATION = YES;
1947+
ENABLE_RESOURCE_ACCESS_AUDIO_INPUT = YES;
1948+
ENABLE_RESOURCE_ACCESS_CAMERA = YES;
1949+
ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY = YES;
1950+
ENABLE_USER_SELECTED_FILES = readwrite;
19541951
GENERATE_INFOPLIST_FILE = YES;
19551952
INFOPLIST_FILE = Kimis/Info.plist;
19561953
INFOPLIST_KEY_CFBundleDisplayName = Kimis;
1954+
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
19571955
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
19581956
INFOPLIST_KEY_NSCameraUsageDescription = "We will take photo with this permission when you asked to do, and we will attach picture to your post or request when possible.";
19591957
INFOPLIST_KEY_NSMicrophoneUsageDescription = "We will take video or record audio with this post when you reuqested.";
@@ -1967,7 +1965,7 @@
19671965
"@executable_path/Frameworks",
19681966
);
19691967
MARKETING_VERSION = 1.17;
1970-
PRODUCT_BUNDLE_IDENTIFIER = wiki.qaq.kimis.inhouse;
1968+
PRODUCT_BUNDLE_IDENTIFIER = wiki.qaq.kimis.inhouse.lakr;
19711969
PRODUCT_NAME = "$(TARGET_NAME)";
19721970
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
19731971
SUPPORTS_MACCATALYST = YES;
@@ -1981,18 +1979,28 @@
19811979
50BED14629277CDF00C9D7E2 /* Release */ = {
19821980
isa = XCBuildConfiguration;
19831981
buildSettings = {
1982+
ARCHS = arm64;
19841983
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
19851984
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
19861985
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
19871986
CODE_SIGN_ENTITLEMENTS = Kimis/Kimis.entitlements;
19881987
CODE_SIGN_IDENTITY = "Apple Development";
19891988
CODE_SIGN_STYLE = Automatic;
19901989
CURRENT_PROJECT_VERSION = 165;
1991-
DEVELOPMENT_TEAM = 6CMYQQFFT8;
1990+
ENABLE_APP_SANDBOX = YES;
1991+
ENABLE_ENHANCED_SECURITY = YES;
19921992
"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
1993+
ENABLE_INCOMING_NETWORK_CONNECTIONS = YES;
1994+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
1995+
ENABLE_POINTER_AUTHENTICATION = YES;
1996+
ENABLE_RESOURCE_ACCESS_AUDIO_INPUT = YES;
1997+
ENABLE_RESOURCE_ACCESS_CAMERA = YES;
1998+
ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY = YES;
1999+
ENABLE_USER_SELECTED_FILES = readwrite;
19932000
GENERATE_INFOPLIST_FILE = YES;
19942001
INFOPLIST_FILE = Kimis/Info.plist;
19952002
INFOPLIST_KEY_CFBundleDisplayName = Kimis;
2003+
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
19962004
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
19972005
INFOPLIST_KEY_NSCameraUsageDescription = "We will take photo with this permission when you asked to do, and we will attach picture to your post or request when possible.";
19982006
INFOPLIST_KEY_NSMicrophoneUsageDescription = "We will take video or record audio with this post when you reuqested.";
@@ -2117,8 +2125,8 @@
21172125
isa = XCRemoteSwiftPackageReference;
21182126
repositoryURL = "https://github.com/hackiftekhar/IQKeyboardManager";
21192127
requirement = {
2120-
kind = exactVersion;
2121-
version = 6.5.11;
2128+
kind = upToNextMajorVersion;
2129+
minimumVersion = 6.5.11;
21222130
};
21232131
};
21242132
50BED2242927802700C9D7E2 /* XCRemoteSwiftPackageReference "SPIndicator" */ = {
@@ -2130,6 +2138,14 @@
21302138
minimumVersion = 0.0.0;
21312139
};
21322140
};
2141+
50F922B62E8AD95200D1E2C1 /* XCRemoteSwiftPackageReference "ChidoriMenu" */ = {
2142+
isa = XCRemoteSwiftPackageReference;
2143+
repositoryURL = "https://github.com/Lakr233/ChidoriMenu";
2144+
requirement = {
2145+
kind = upToNextMajorVersion;
2146+
minimumVersion = 4.0.0;
2147+
};
2148+
};
21332149
/* End XCRemoteSwiftPackageReference section */
21342150

21352151
/* Begin XCSwiftPackageProductDependency section */
@@ -2187,6 +2203,11 @@
21872203
package = 50BED2242927802700C9D7E2 /* XCRemoteSwiftPackageReference "SPIndicator" */;
21882204
productName = SPIndicator;
21892205
};
2206+
50F922B72E8AD95200D1E2C1 /* ChidoriMenu */ = {
2207+
isa = XCSwiftPackageProductDependency;
2208+
package = 50F922B62E8AD95200D1E2C1 /* XCRemoteSwiftPackageReference "ChidoriMenu" */;
2209+
productName = ChidoriMenu;
2210+
};
21902211
/* End XCSwiftPackageProductDependency section */
21912212
};
21922213
rootObject = 50BED12829277CDE00C9D7E2 /* Project object */;

‎Kimis.xcodeproj/xcshareddata/xcschemes/Kimis.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "2600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 29 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)