Skip to content

Commit 64aa1d5

Browse files
committed
fix: build ci/Cd
1 parent 6812305 commit 64aa1d5

File tree

2 files changed

+32
-9
lines changed

2 files changed

+32
-9
lines changed

ios/Plugin.xcodeproj/project.pbxproj

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 48;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -195,7 +195,7 @@
195195
attributes = {
196196
LastSwiftUpdateCheck = 0920;
197197
LastUpgradeCheck = 1160;
198-
ORGANIZATIONNAME = "Max Lynch";
198+
ORGANIZATIONNAME = Capgo;
199199
TargetAttributes = {
200200
50ADFF87201F53D600D50D53 = {
201201
CreatedOnToolsVersion = 9.2;
@@ -210,7 +210,7 @@
210210
};
211211
};
212212
buildConfigurationList = 50ADFF82201F53D600D50D53 /* Build configuration list for PBXProject "Plugin" */;
213-
compatibilityVersion = "Xcode 8.0";
213+
compatibilityVersion = "Xcode 15.0";
214214
developmentRegion = en;
215215
hasScannedForEncodings = 0;
216216
knownRegions = (
@@ -453,7 +453,8 @@
453453
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
454454
MTL_ENABLE_DEBUG_INFO = NO;
455455
SDKROOT = iphoneos;
456-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
456+
SWIFT_COMPILATION_MODE = wholemodule;
457+
SWIFT_OPTIMIZATION_LEVEL = "-O";
457458
VALIDATE_PRODUCT = YES;
458459
VERSIONING_SYSTEM = "apple-generic";
459460
VERSION_INFO_PREFIX = "";
@@ -474,7 +475,12 @@
474475
INFOPLIST_FILE = Plugin/Info.plist;
475476
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
476477
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
477-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
478+
LD_RUNPATH_SEARCH_PATHS = (
479+
"$(inherited)",
480+
"@executable_path/Frameworks",
481+
"@loader_path/Frameworks",
482+
"$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)",
483+
);
478484
ONLY_ACTIVE_ARCH = YES;
479485
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
480486
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -502,7 +508,12 @@
502508
INFOPLIST_FILE = Plugin/Info.plist;
503509
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
504510
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
505-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
511+
LD_RUNPATH_SEARCH_PATHS = (
512+
"$(inherited)",
513+
"@executable_path/Frameworks",
514+
"@loader_path/Frameworks",
515+
"$(FRAMEWORK_SEARCH_PATHS)",
516+
);
506517
ONLY_ACTIVE_ARCH = NO;
507518
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
508519
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -521,9 +532,15 @@
521532
buildSettings = {
522533
CODE_SIGN_STYLE = Automatic;
523534
INFOPLIST_FILE = PluginTests/Info.plist;
524-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
535+
LD_RUNPATH_SEARCH_PATHS = (
536+
"$(inherited)",
537+
"@executable_path/Frameworks",
538+
"@loader_path/Frameworks",
539+
);
525540
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.PluginTests;
526541
PRODUCT_NAME = "$(TARGET_NAME)";
542+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
543+
SUPPORTS_MACCATALYST = NO;
527544
SWIFT_VERSION = 5.0;
528545
TARGETED_DEVICE_FAMILY = "1,2";
529546
};
@@ -535,9 +552,15 @@
535552
buildSettings = {
536553
CODE_SIGN_STYLE = Automatic;
537554
INFOPLIST_FILE = PluginTests/Info.plist;
538-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
555+
LD_RUNPATH_SEARCH_PATHS = (
556+
"$(inherited)",
557+
"@executable_path/Frameworks",
558+
"@loader_path/Frameworks",
559+
);
539560
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.PluginTests;
540561
PRODUCT_NAME = "$(TARGET_NAME)";
562+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
563+
SUPPORTS_MACCATALYST = NO;
541564
SWIFT_VERSION = 5.0;
542565
TARGETED_DEVICE_FAMILY = "1,2";
543566
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131
"scripts": {
3232
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
33-
"verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
33+
"verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -sdk iphoneos -scheme Plugin && cd ..",
3434
"verify:android": "cd android && ./gradlew clean build test && cd ..",
3535
"verify:web": "npm run build",
3636
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",

0 commit comments

Comments
 (0)