Skip to content

Commit fcb9105

Browse files
HaleXieHaleXie
authored
Merge pull request #3 from HaleXie/hl
Update the resource bundle using iphoneos sdk and change build script not to sign the resource bundle
2 parents 5ea6262 + 62bbd45 commit fcb9105

3 files changed

Lines changed: 78 additions & 68 deletions

File tree

‎MessageKit.xcodeproj/project.pbxproj‎

Lines changed: 67 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
C72A8F532944400E006DB10F /* PlayButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72A8F0B2944400E006DB10F /* PlayButtonView.swift */; };
8181
C72A8F542944400E006DB10F /* BubbleCircle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72A8F0C2944400E006DB10F /* BubbleCircle.swift */; };
8282
C72A8F5A29444349006DB10F /* InputBarAccessoryView in Frameworks */ = {isa = PBXBuildFile; productRef = C72A8F5929444349006DB10F /* InputBarAccessoryView */; };
83-
C7CB28222943270000C8328F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C7CB28212943270000C8328F /* Assets.xcassets */; };
83+
C79D579B296BF5790044D518 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C7CB28212943270000C8328F /* Assets.xcassets */; };
8484
/* End PBXBuildFile section */
8585

8686
/* Begin PBXFileReference section */
@@ -157,7 +157,9 @@
157157
C72A8F0A2944400E006DB10F /* MessagesCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessagesCollectionView.swift; sourceTree = "<group>"; };
158158
C72A8F0B2944400E006DB10F /* PlayButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayButtonView.swift; sourceTree = "<group>"; };
159159
C72A8F0C2944400E006DB10F /* BubbleCircle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BubbleCircle.swift; sourceTree = "<group>"; };
160-
C7CB280D2943263700C8328F /* MessageKitResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessageKitResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
160+
C79D578D296BF4F90044D518 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
161+
C79D5794296BF53E0044D518 /* MessageKitResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessageKitResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
162+
C79D5796296BF53E0044D518 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
161163
C7CB28212943270000C8328F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Sources/Assets.xcassets; sourceTree = "<group>"; };
162164
/* End PBXFileReference section */
163165

@@ -170,13 +172,6 @@
170172
);
171173
runOnlyForDeploymentPostprocessing = 0;
172174
};
173-
C7CB280A2943263700C8328F /* Frameworks */ = {
174-
isa = PBXFrameworksBuildPhase;
175-
buildActionMask = 2147483647;
176-
files = (
177-
);
178-
runOnlyForDeploymentPostprocessing = 0;
179-
};
180175
/* End PBXFrameworksBuildPhase section */
181176

182177
/* Begin PBXGroup section */
@@ -345,11 +340,29 @@
345340
name = Frameworks;
346341
sourceTree = "<group>";
347342
};
343+
C79D578C296BF4F90044D518 /* MessageKitResources */ = {
344+
isa = PBXGroup;
345+
children = (
346+
C79D578D296BF4F90044D518 /* Info.plist */,
347+
);
348+
path = MessageKitResources;
349+
sourceTree = "<group>";
350+
};
351+
C79D5795296BF53E0044D518 /* MessageKitResources */ = {
352+
isa = PBXGroup;
353+
children = (
354+
C79D5796296BF53E0044D518 /* Info.plist */,
355+
);
356+
path = MessageKitResources;
357+
sourceTree = "<group>";
358+
};
348359
C7CB27F0294324CA00C8328F = {
349360
isa = PBXGroup;
350361
children = (
351362
C7CB28212943270000C8328F /* Assets.xcassets */,
352363
C72A8DF629443D1E006DB10F /* MessageKit */,
364+
C79D578C296BF4F90044D518 /* MessageKitResources */,
365+
C79D5795296BF53E0044D518 /* MessageKitResources */,
353366
C7CB27FE2943253B00C8328F /* Products */,
354367
C72A8F5829444349006DB10F /* Frameworks */,
355368
);
@@ -358,8 +371,8 @@
358371
C7CB27FE2943253B00C8328F /* Products */ = {
359372
isa = PBXGroup;
360373
children = (
361-
C7CB280D2943263700C8328F /* MessageKitResources.bundle */,
362374
C72A8DF529443D1E006DB10F /* MessageKit.framework */,
375+
C79D5794296BF53E0044D518 /* MessageKitResources.bundle */,
363376
);
364377
name = Products;
365378
sourceTree = "<group>";
@@ -400,23 +413,19 @@
400413
productReference = C72A8DF529443D1E006DB10F /* MessageKit.framework */;
401414
productType = "com.apple.product-type.framework";
402415
};
403-
C7CB280C2943263700C8328F /* MessageKitResources */ = {
416+
C79D5793296BF53E0044D518 /* MessageKitResources */ = {
404417
isa = PBXNativeTarget;
405-
buildConfigurationList = C7CB280E2943263700C8328F /* Build configuration list for PBXNativeTarget "MessageKitResources" */;
418+
buildConfigurationList = C79D5797296BF53E0044D518 /* Build configuration list for PBXNativeTarget "MessageKitResources" */;
406419
buildPhases = (
407-
C7CB28092943263700C8328F /* Sources */,
408-
C7CB280A2943263700C8328F /* Frameworks */,
409-
C7CB280B2943263700C8328F /* Resources */,
420+
C79D5792296BF53E0044D518 /* Resources */,
410421
);
411422
buildRules = (
412423
);
413424
dependencies = (
414425
);
415426
name = MessageKitResources;
416-
packageProductDependencies = (
417-
);
418427
productName = MessageKitResources;
419-
productReference = C7CB280D2943263700C8328F /* MessageKitResources.bundle */;
428+
productReference = C79D5794296BF53E0044D518 /* MessageKitResources.bundle */;
420429
productType = "com.apple.product-type.bundle";
421430
};
422431
/* End PBXNativeTarget section */
@@ -432,8 +441,8 @@
432441
CreatedOnToolsVersion = 13.4.1;
433442
LastSwiftMigration = 1340;
434443
};
435-
C7CB280C2943263700C8328F = {
436-
CreatedOnToolsVersion = 13.4.1;
444+
C79D5793296BF53E0044D518 = {
445+
CreatedOnToolsVersion = 14.2;
437446
};
438447
};
439448
};
@@ -453,8 +462,8 @@
453462
projectDirPath = "";
454463
projectRoot = "";
455464
targets = (
456-
C7CB280C2943263700C8328F /* MessageKitResources */,
457465
C72A8DF429443D1E006DB10F /* MessageKit */,
466+
C79D5793296BF53E0044D518 /* MessageKitResources */,
458467
);
459468
};
460469
/* End PBXProject section */
@@ -467,11 +476,11 @@
467476
);
468477
runOnlyForDeploymentPostprocessing = 0;
469478
};
470-
C7CB280B2943263700C8328F /* Resources */ = {
479+
C79D5792296BF53E0044D518 /* Resources */ = {
471480
isa = PBXResourcesBuildPhase;
472481
buildActionMask = 2147483647;
473482
files = (
474-
C7CB28222943270000C8328F /* Assets.xcassets in Resources */,
483+
C79D579B296BF5790044D518 /* Assets.xcassets in Resources */,
475484
);
476485
runOnlyForDeploymentPostprocessing = 0;
477486
};
@@ -555,13 +564,6 @@
555564
);
556565
runOnlyForDeploymentPostprocessing = 0;
557566
};
558-
C7CB28092943263700C8328F /* Sources */ = {
559-
isa = PBXSourcesBuildPhase;
560-
buildActionMask = 2147483647;
561-
files = (
562-
);
563-
runOnlyForDeploymentPostprocessing = 0;
564-
};
565567
/* End PBXSourcesBuildPhase section */
566568

567569
/* Begin XCBuildConfiguration section */
@@ -731,25 +733,13 @@
731733
};
732734
name = Release;
733735
};
734-
C7CB27F5294324CA00C8328F /* Debug */ = {
735-
isa = XCBuildConfiguration;
736-
buildSettings = {
737-
};
738-
name = Debug;
739-
};
740-
C7CB27F6294324CA00C8328F /* Release */ = {
741-
isa = XCBuildConfiguration;
742-
buildSettings = {
743-
};
744-
name = Release;
745-
};
746-
C7CB280F2943263700C8328F /* Debug */ = {
736+
C79D5798296BF53E0044D518 /* Debug */ = {
747737
isa = XCBuildConfiguration;
748738
buildSettings = {
749739
ALWAYS_SEARCH_USER_PATHS = NO;
750740
CLANG_ANALYZER_NONNULL = YES;
751741
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
752-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
742+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
753743
CLANG_ENABLE_MODULES = YES;
754744
CLANG_ENABLE_OBJC_ARC = YES;
755745
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -775,11 +765,10 @@
775765
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
776766
CLANG_WARN_UNREACHABLE_CODE = YES;
777767
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
778-
CODE_SIGN_IDENTITY = "Apple Development";
779768
CODE_SIGN_STYLE = Automatic;
780769
COMBINE_HIDPI_IMAGES = YES;
781770
COPY_PHASE_STRIP = NO;
782-
CURRENT_PROJECT_VERSION = 3;
771+
CURRENT_PROJECT_VERSION = 4;
783772
DEBUG_INFORMATION_FORMAT = dwarf;
784773
DEVELOPMENT_TEAM = VGG743YS65;
785774
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -799,31 +788,30 @@
799788
GCC_WARN_UNUSED_FUNCTION = YES;
800789
GCC_WARN_UNUSED_VARIABLE = YES;
801790
GENERATE_INFOPLIST_FILE = YES;
802-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
803-
INFOPLIST_KEY_NSPrincipalClass = "";
804791
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
805-
MACOSX_DEPLOYMENT_TARGET = 12.3;
806-
MARKETING_VERSION = 1.0.3;
792+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
793+
MARKETING_VERSION = 1.0.4;
807794
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
808795
MTL_FAST_MATH = YES;
809796
ONLY_ACTIVE_ARCH = YES;
810797
PRODUCT_BUNDLE_IDENTIFIER = com.helplightning.MessageKitResources;
811798
PRODUCT_NAME = "$(TARGET_NAME)";
812-
PROVISIONING_PROFILE_SPECIFIER = "";
813-
SDKROOT = macosx;
799+
SDKROOT = iphoneos;
814800
SKIP_INSTALL = YES;
801+
SUPPORTS_MACCATALYST = NO;
815802
SWIFT_EMIT_LOC_STRINGS = YES;
803+
TARGETED_DEVICE_FAMILY = "1,2";
816804
WRAPPER_EXTENSION = bundle;
817805
};
818806
name = Debug;
819807
};
820-
C7CB28102943263700C8328F /* Release */ = {
808+
C79D5799296BF53E0044D518 /* Release */ = {
821809
isa = XCBuildConfiguration;
822810
buildSettings = {
823811
ALWAYS_SEARCH_USER_PATHS = NO;
824812
CLANG_ANALYZER_NONNULL = YES;
825813
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
826-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
814+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
827815
CLANG_ENABLE_MODULES = YES;
828816
CLANG_ENABLE_OBJC_ARC = YES;
829817
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -849,11 +837,10 @@
849837
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
850838
CLANG_WARN_UNREACHABLE_CODE = YES;
851839
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
852-
CODE_SIGN_IDENTITY = "Apple Development";
853840
CODE_SIGN_STYLE = Automatic;
854841
COMBINE_HIDPI_IMAGES = YES;
855842
COPY_PHASE_STRIP = NO;
856-
CURRENT_PROJECT_VERSION = 3;
843+
CURRENT_PROJECT_VERSION = 4;
857844
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
858845
DEVELOPMENT_TEAM = VGG743YS65;
859846
ENABLE_NS_ASSERTIONS = NO;
@@ -867,23 +854,35 @@
867854
GCC_WARN_UNUSED_FUNCTION = YES;
868855
GCC_WARN_UNUSED_VARIABLE = YES;
869856
GENERATE_INFOPLIST_FILE = YES;
870-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
871-
INFOPLIST_KEY_NSPrincipalClass = "";
872857
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
873-
MACOSX_DEPLOYMENT_TARGET = 12.3;
874-
MARKETING_VERSION = 1.0.3;
858+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
859+
MARKETING_VERSION = 1.0.4;
875860
MTL_ENABLE_DEBUG_INFO = NO;
876861
MTL_FAST_MATH = YES;
877862
PRODUCT_BUNDLE_IDENTIFIER = com.helplightning.MessageKitResources;
878863
PRODUCT_NAME = "$(TARGET_NAME)";
879-
PROVISIONING_PROFILE_SPECIFIER = "";
880-
SDKROOT = macosx;
864+
SDKROOT = iphoneos;
881865
SKIP_INSTALL = YES;
866+
SUPPORTS_MACCATALYST = NO;
882867
SWIFT_EMIT_LOC_STRINGS = YES;
868+
TARGETED_DEVICE_FAMILY = "1,2";
869+
VALIDATE_PRODUCT = YES;
883870
WRAPPER_EXTENSION = bundle;
884871
};
885872
name = Release;
886873
};
874+
C7CB27F5294324CA00C8328F /* Debug */ = {
875+
isa = XCBuildConfiguration;
876+
buildSettings = {
877+
};
878+
name = Debug;
879+
};
880+
C7CB27F6294324CA00C8328F /* Release */ = {
881+
isa = XCBuildConfiguration;
882+
buildSettings = {
883+
};
884+
name = Release;
885+
};
887886
/* End XCBuildConfiguration section */
888887

889888
/* Begin XCConfigurationList section */
@@ -896,20 +895,20 @@
896895
defaultConfigurationIsVisible = 0;
897896
defaultConfigurationName = Release;
898897
};
899-
C7CB27F4294324CA00C8328F /* Build configuration list for PBXProject "MessageKit" */ = {
898+
C79D5797296BF53E0044D518 /* Build configuration list for PBXNativeTarget "MessageKitResources" */ = {
900899
isa = XCConfigurationList;
901900
buildConfigurations = (
902-
C7CB27F5294324CA00C8328F /* Debug */,
903-
C7CB27F6294324CA00C8328F /* Release */,
901+
C79D5798296BF53E0044D518 /* Debug */,
902+
C79D5799296BF53E0044D518 /* Release */,
904903
);
905904
defaultConfigurationIsVisible = 0;
906905
defaultConfigurationName = Release;
907906
};
908-
C7CB280E2943263700C8328F /* Build configuration list for PBXNativeTarget "MessageKitResources" */ = {
907+
C7CB27F4294324CA00C8328F /* Build configuration list for PBXProject "MessageKit" */ = {
909908
isa = XCConfigurationList;
910909
buildConfigurations = (
911-
C7CB280F2943263700C8328F /* Debug */,
912-
C7CB28102943263700C8328F /* Release */,
910+
C7CB27F5294324CA00C8328F /* Debug */,
911+
C7CB27F6294324CA00C8328F /* Release */,
913912
);
914913
defaultConfigurationIsVisible = 0;
915914
defaultConfigurationName = Release;

‎MessageKitResources/Info.plist‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundlePackageType</key>
6+
<string>BNDL</string>
7+
<key>NSPrincipalClass</key>
8+
<string></string>
9+
</dict>
10+
</plist>

‎Scripts/build_resource.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ xcodebuild clean build -project ${MK_PPROJECT} \
3030
${MK_BUILD_SETTING} \
3131
-sdk iphoneos \
3232
ONLY_ACTIVE_ARCH=NO \
33+
CODE_SIGNING_ALLOWED=NO \
3334

3435
MK_OUTPUT_DIR=${PROJECT_DIR}/distributive/
3536
mkdir -p "${MK_OUTPUT_DIR}"

0 commit comments

Comments
 (0)