Skip to content

Commit 5c76ab0

Browse files
rdlabordlabo
committed
feat(demo): ios spm is be default
1 parent 255d975 commit 5c76ab0

File tree

12 files changed

+121
-202
lines changed

12 files changed

+121
-202
lines changed

‎demo/angular/ios/App/App.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
1010
2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
11+
4D22ABE92AF431CB00220026 /* CapApp-SPM in Frameworks */ = {isa = PBXBuildFile; productRef = 4D22ABE82AF431CB00220026 /* CapApp-SPM */; };
1112
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
1213
504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
1314
504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
1415
504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
1516
504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
1617
50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
17-
A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
@@ -27,39 +27,28 @@
2727
504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
2828
504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2929
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
30-
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
31-
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
32-
DB71AA3C2EEFE04D00F88B08 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
33-
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
30+
958DCC722DB07C7200EA8C5F /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = debug.xcconfig; path = ../debug.xcconfig; sourceTree = SOURCE_ROOT; };
31+
DB1B01042EF5576C003B61CF /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
3432
/* End PBXFileReference section */
3533

3634
/* Begin PBXFrameworksBuildPhase section */
3735
504EC3011FED79650016851F /* Frameworks */ = {
3836
isa = PBXFrameworksBuildPhase;
3937
buildActionMask = 2147483647;
4038
files = (
41-
A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
39+
4D22ABE92AF431CB00220026 /* CapApp-SPM in Frameworks */,
4240
);
4341
runOnlyForDeploymentPostprocessing = 0;
4442
};
4543
/* End PBXFrameworksBuildPhase section */
4644

4745
/* Begin PBXGroup section */
48-
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
49-
isa = PBXGroup;
50-
children = (
51-
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
52-
);
53-
name = Frameworks;
54-
sourceTree = "<group>";
55-
};
5646
504EC2FB1FED79650016851F = {
5747
isa = PBXGroup;
5848
children = (
49+
958DCC722DB07C7200EA8C5F /* debug.xcconfig */,
5950
504EC3061FED79650016851F /* App */,
6051
504EC3051FED79650016851F /* Products */,
61-
7F8756D8B27F46E3366F6CEA /* Pods */,
62-
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
6352
);
6453
sourceTree = "<group>";
6554
};
@@ -74,7 +63,7 @@
7463
504EC3061FED79650016851F /* App */ = {
7564
isa = PBXGroup;
7665
children = (
77-
DB71AA3C2EEFE04D00F88B08 /* App.entitlements */,
66+
DB1B01042EF5576C003B61CF /* App.entitlements */,
7867
50379B222058CBB4000EE86E /* capacitor.config.json */,
7968
504EC3071FED79650016851F /* AppDelegate.swift */,
8069
504EC30B1FED79650016851F /* Main.storyboard */,
@@ -87,33 +76,25 @@
8776
path = App;
8877
sourceTree = "<group>";
8978
};
90-
7F8756D8B27F46E3366F6CEA /* Pods */ = {
91-
isa = PBXGroup;
92-
children = (
93-
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
94-
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
95-
);
96-
name = Pods;
97-
sourceTree = "<group>";
98-
};
9979
/* End PBXGroup section */
10080

10181
/* Begin PBXNativeTarget section */
10282
504EC3031FED79650016851F /* App */ = {
10383
isa = PBXNativeTarget;
10484
buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
10585
buildPhases = (
106-
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
10786
504EC3001FED79650016851F /* Sources */,
10887
504EC3011FED79650016851F /* Frameworks */,
10988
504EC3021FED79650016851F /* Resources */,
110-
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
11189
);
11290
buildRules = (
11391
);
11492
dependencies = (
11593
);
11694
name = App;
95+
packageProductDependencies = (
96+
4D22ABE82AF431CB00220026 /* CapApp-SPM */,
97+
);
11798
productName = App;
11899
productReference = 504EC3041FED79650016851F /* App.app */;
119100
productType = "com.apple.product-type.application";
@@ -144,6 +125,7 @@
144125
);
145126
mainGroup = 504EC2FB1FED79650016851F;
146127
packageReferences = (
128+
D4C12C0A2AAA248700AAC8A2 /* XCLocalSwiftPackageReference "CapApp-SPM" */,
147129
);
148130
productRefGroup = 504EC3051FED79650016851F /* Products */;
149131
projectDirPath = "";
@@ -170,42 +152,6 @@
170152
};
171153
/* End PBXResourcesBuildPhase section */
172154

173-
/* Begin PBXShellScriptBuildPhase section */
174-
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
175-
isa = PBXShellScriptBuildPhase;
176-
buildActionMask = 2147483647;
177-
files = (
178-
);
179-
inputPaths = (
180-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
181-
"${PODS_ROOT}/Manifest.lock",
182-
);
183-
name = "[CP] Check Pods Manifest.lock";
184-
outputPaths = (
185-
"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
186-
);
187-
runOnlyForDeploymentPostprocessing = 0;
188-
shellPath = /bin/sh;
189-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
190-
showEnvVarsInLog = 0;
191-
};
192-
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
193-
isa = PBXShellScriptBuildPhase;
194-
buildActionMask = 2147483647;
195-
files = (
196-
);
197-
inputPaths = (
198-
);
199-
name = "[CP] Embed Pods Frameworks";
200-
outputPaths = (
201-
);
202-
runOnlyForDeploymentPostprocessing = 0;
203-
shellPath = /bin/sh;
204-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
205-
showEnvVarsInLog = 0;
206-
};
207-
/* End PBXShellScriptBuildPhase section */
208-
209155
/* Begin PBXSourcesBuildPhase section */
210156
504EC3001FED79650016851F /* Sources */ = {
211157
isa = PBXSourcesBuildPhase;
@@ -239,6 +185,7 @@
239185
/* Begin XCBuildConfiguration section */
240186
504EC3141FED79650016851F /* Debug */ = {
241187
isa = XCBuildConfiguration;
188+
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
242189
buildSettings = {
243190
ALWAYS_SEARCH_USER_PATHS = NO;
244191
CLANG_ANALYZER_NONNULL = YES;
@@ -339,29 +286,31 @@
339286
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
340287
MTL_ENABLE_DEBUG_INFO = NO;
341288
SDKROOT = iphoneos;
342-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
289+
SWIFT_COMPILATION_MODE = wholemodule;
290+
SWIFT_OPTIMIZATION_LEVEL = "-O";
343291
VALIDATE_PRODUCT = YES;
344292
};
345293
name = Release;
346294
};
347295
504EC3171FED79650016851F /* Debug */ = {
348296
isa = XCBuildConfiguration;
349-
baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
297+
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
350298
buildSettings = {
351299
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
352300
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
353-
CODE_SIGN_IDENTITY = "Apple Development";
354301
CODE_SIGN_STYLE = Automatic;
355302
CURRENT_PROJECT_VERSION = 1;
356303
DEVELOPMENT_TEAM = P7E2DJ2G49;
357304
INFOPLIST_FILE = App/Info.plist;
358305
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
359-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
306+
LD_RUNPATH_SEARCH_PATHS = (
307+
"$(inherited)",
308+
"@executable_path/Frameworks",
309+
);
360310
MARKETING_VERSION = 1.0;
361311
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
362312
PRODUCT_BUNDLE_IDENTIFIER = com.capacitor.stripe;
363313
PRODUCT_NAME = "$(TARGET_NAME)";
364-
PROVISIONING_PROFILE_SPECIFIER = "";
365314
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
366315
SWIFT_VERSION = 5.0;
367316
TARGETED_DEVICE_FAMILY = "1,2";
@@ -370,21 +319,21 @@
370319
};
371320
504EC3181FED79650016851F /* Release */ = {
372321
isa = XCBuildConfiguration;
373-
baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
374322
buildSettings = {
375323
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
376324
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
377-
CODE_SIGN_IDENTITY = "Apple Development";
378325
CODE_SIGN_STYLE = Automatic;
379326
CURRENT_PROJECT_VERSION = 1;
380327
DEVELOPMENT_TEAM = P7E2DJ2G49;
381328
INFOPLIST_FILE = App/Info.plist;
382329
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
383-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
330+
LD_RUNPATH_SEARCH_PATHS = (
331+
"$(inherited)",
332+
"@executable_path/Frameworks",
333+
);
384334
MARKETING_VERSION = 1.0;
385335
PRODUCT_BUNDLE_IDENTIFIER = com.capacitor.stripe;
386336
PRODUCT_NAME = "$(TARGET_NAME)";
387-
PROVISIONING_PROFILE_SPECIFIER = "";
388337
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
389338
SWIFT_VERSION = 5.0;
390339
TARGETED_DEVICE_FAMILY = "1,2";
@@ -413,6 +362,21 @@
413362
defaultConfigurationName = Release;
414363
};
415364
/* End XCConfigurationList section */
365+
366+
/* Begin XCLocalSwiftPackageReference section */
367+
D4C12C0A2AAA248700AAC8A2 /* XCLocalSwiftPackageReference "CapApp-SPM" */ = {
368+
isa = XCLocalSwiftPackageReference;
369+
relativePath = "CapApp-SPM";
370+
};
371+
/* End XCLocalSwiftPackageReference section */
372+
373+
/* Begin XCSwiftPackageProductDependency section */
374+
4D22ABE82AF431CB00220026 /* CapApp-SPM */ = {
375+
isa = XCSwiftPackageProductDependency;
376+
package = D4C12C0A2AAA248700AAC8A2 /* XCLocalSwiftPackageReference "CapApp-SPM" */;
377+
productName = "CapApp-SPM";
378+
};
379+
/* End XCSwiftPackageProductDependency section */
416380
};
417381
rootObject = 504EC2FC1FED79650016851F /* Project object */;
418382
}

demo/angular/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to demo/angular/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.

‎demo/angular/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

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

‎demo/angular/ios/App/App.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎demo/angular/ios/App/App/Info.plist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CAPACITOR_DEBUG</key>
6+
<string>$(CAPACITOR_DEBUG)</string>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>
8-
<string>capacitor-stripe</string>
10+
<string>capacitor-stripe</string>
911
<key>CFBundleExecutable</key>
1012
<string>$(EXECUTABLE_NAME)</string>
1113
<key>CFBundleIdentifier</key>

‎demo/angular/ios/App/CapApp-SPM/.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.DS_Store
2+
/.build
3+
/Packages
4+
/*.xcodeproj
5+
xcuserdata/
6+
DerivedData/
7+
.swiftpm/config/registries.json
8+
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
9+
.netrc

‎demo/angular/ios/App/CapApp-SPM/Package.swift‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// swift-tools-version: 5.9
2+
import PackageDescription
3+
4+
// DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands
5+
let package = Package(
6+
name: "CapApp-SPM",
7+
platforms: [.iOS(.v15)],
8+
products: [
9+
.library(
10+
name: "CapApp-SPM",
11+
targets: ["CapApp-SPM"])
12+
],
13+
dependencies: [
14+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0"),
15+
.package(name: "CapacitorCommunityStripe", path: "../../../../../packages/payment"),
16+
.package(name: "CapacitorCommunityStripeIdentity", path: "../../../../../packages/identity"),
17+
.package(name: "CapacitorCommunityStripeTerminal", path: "../../../../../packages/terminal")
18+
],
19+
targets: [
20+
.target(
21+
name: "CapApp-SPM",
22+
dependencies: [
23+
.product(name: "Capacitor", package: "capacitor-swift-pm"),
24+
.product(name: "Cordova", package: "capacitor-swift-pm"),
25+
.product(name: "CapacitorCommunityStripe", package: "CapacitorCommunityStripe"),
26+
.product(name: "CapacitorCommunityStripeIdentity", package: "CapacitorCommunityStripeIdentity"),
27+
.product(name: "CapacitorCommunityStripeTerminal", package: "CapacitorCommunityStripeTerminal")
28+
]
29+
)
30+
]
31+
)

‎demo/angular/ios/App/CapApp-SPM/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# CapApp-SPM
2+
3+
This SPM is used to host SPM dependencies for you Capacitor project
4+
5+
Do not modify the contents of it or there may be unintended consequences.

‎demo/angular/ios/App/CapApp-SPM/Sources/CapApp-SPM/CapApp-SPM.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
public let isCapacitorApp = true

‎demo/angular/ios/App/Podfile‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)