Skip to content

Commit d6aa7a0

Browse files
andredestroandredestro
committed
misc: migrate example app to spm
1 parent a9d2a8f commit d6aa7a0

File tree

11 files changed

+109
-116
lines changed

11 files changed

+109
-116
lines changed

‎example-app/ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 49 additions & 78 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,38 +27,27 @@
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-
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; };
3331
/* End PBXFileReference section */
3432

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

4644
/* Begin PBXGroup section */
47-
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
48-
isa = PBXGroup;
49-
children = (
50-
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
51-
);
52-
name = Frameworks;
53-
sourceTree = "<group>";
54-
};
5545
504EC2FB1FED79650016851F = {
5646
isa = PBXGroup;
5747
children = (
48+
958DCC722DB07C7200EA8C5F /* debug.xcconfig */,
5849
504EC3061FED79650016851F /* App */,
5950
504EC3051FED79650016851F /* Products */,
60-
7F8756D8B27F46E3366F6CEA /* Pods */,
61-
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
6251
);
6352
sourceTree = "<group>";
6453
};
@@ -85,33 +74,25 @@
8574
path = App;
8675
sourceTree = "<group>";
8776
};
88-
7F8756D8B27F46E3366F6CEA /* Pods */ = {
89-
isa = PBXGroup;
90-
children = (
91-
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
92-
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
93-
);
94-
name = Pods;
95-
sourceTree = "<group>";
96-
};
9777
/* End PBXGroup section */
9878

9979
/* Begin PBXNativeTarget section */
10080
504EC3031FED79650016851F /* App */ = {
10181
isa = PBXNativeTarget;
10282
buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
10383
buildPhases = (
104-
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
10584
504EC3001FED79650016851F /* Sources */,
10685
504EC3011FED79650016851F /* Frameworks */,
10786
504EC3021FED79650016851F /* Resources */,
108-
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
10987
);
11088
buildRules = (
11189
);
11290
dependencies = (
11391
);
11492
name = App;
93+
packageProductDependencies = (
94+
4D22ABE82AF431CB00220026 /* CapApp-SPM */,
95+
);
11596
productName = App;
11697
productReference = 504EC3041FED79650016851F /* App.app */;
11798
productType = "com.apple.product-type.application";
@@ -128,7 +109,6 @@
128109
504EC3031FED79650016851F = {
129110
CreatedOnToolsVersion = 9.2;
130111
LastSwiftMigration = 1100;
131-
ProvisioningStyle = Automatic;
132112
};
133113
};
134114
};
@@ -142,6 +122,7 @@
142122
);
143123
mainGroup = 504EC2FB1FED79650016851F;
144124
packageReferences = (
125+
D4C12C0A2AAA248700AAC8A2 /* XCLocalSwiftPackageReference "CapApp-SPM" */,
145126
);
146127
productRefGroup = 504EC3051FED79650016851F /* Products */;
147128
projectDirPath = "";
@@ -168,42 +149,6 @@
168149
};
169150
/* End PBXResourcesBuildPhase section */
170151

171-
/* Begin PBXShellScriptBuildPhase section */
172-
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
173-
isa = PBXShellScriptBuildPhase;
174-
buildActionMask = 2147483647;
175-
files = (
176-
);
177-
inputPaths = (
178-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
179-
"${PODS_ROOT}/Manifest.lock",
180-
);
181-
name = "[CP] Check Pods Manifest.lock";
182-
outputPaths = (
183-
"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
184-
);
185-
runOnlyForDeploymentPostprocessing = 0;
186-
shellPath = /bin/sh;
187-
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";
188-
showEnvVarsInLog = 0;
189-
};
190-
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
191-
isa = PBXShellScriptBuildPhase;
192-
buildActionMask = 2147483647;
193-
files = (
194-
);
195-
inputPaths = (
196-
);
197-
name = "[CP] Embed Pods Frameworks";
198-
outputPaths = (
199-
);
200-
runOnlyForDeploymentPostprocessing = 0;
201-
shellPath = /bin/sh;
202-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
203-
showEnvVarsInLog = 0;
204-
};
205-
/* End PBXShellScriptBuildPhase section */
206-
207152
/* Begin PBXSourcesBuildPhase section */
208153
504EC3001FED79650016851F /* Sources */ = {
209154
isa = PBXSourcesBuildPhase;
@@ -237,6 +182,7 @@
237182
/* Begin XCBuildConfiguration section */
238183
504EC3141FED79650016851F /* Debug */ = {
239184
isa = XCBuildConfiguration;
185+
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
240186
buildSettings = {
241187
ALWAYS_SEARCH_USER_PATHS = NO;
242188
CLANG_ANALYZER_NONNULL = YES;
@@ -283,7 +229,7 @@
283229
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
284230
GCC_WARN_UNUSED_FUNCTION = YES;
285231
GCC_WARN_UNUSED_VARIABLE = YES;
286-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
232+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
287233
MTL_ENABLE_DEBUG_INFO = YES;
288234
ONLY_ACTIVE_ARCH = YES;
289235
SDKROOT = iphoneos;
@@ -334,29 +280,36 @@
334280
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
335281
GCC_WARN_UNUSED_FUNCTION = YES;
336282
GCC_WARN_UNUSED_VARIABLE = YES;
337-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
283+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
338284
MTL_ENABLE_DEBUG_INFO = NO;
339285
SDKROOT = iphoneos;
340-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
286+
SWIFT_COMPILATION_MODE = wholemodule;
287+
SWIFT_OPTIMIZATION_LEVEL = "-O";
341288
VALIDATE_PRODUCT = YES;
342289
};
343290
name = Release;
344291
};
345292
504EC3171FED79650016851F /* Debug */ = {
346293
isa = XCBuildConfiguration;
347-
baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
294+
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
348295
buildSettings = {
349296
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
350-
CODE_SIGN_STYLE = Automatic;
297+
CODE_SIGN_STYLE = Manual;
351298
CURRENT_PROJECT_VERSION = 1;
352-
DEVELOPMENT_TEAM = EVSWK8BA55;
299+
DEVELOPMENT_TEAM = "";
300+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EVSWK8BA55;
353301
INFOPLIST_FILE = App/Info.plist;
354302
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
355-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
303+
LD_RUNPATH_SEARCH_PATHS = (
304+
"$(inherited)",
305+
"@executable_path/Frameworks",
306+
);
356307
MARKETING_VERSION = 1.0;
357308
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
358-
PRODUCT_BUNDLE_IDENTIFIER = com.outsystems.rd;
309+
PRODUCT_BUNDLE_IDENTIFIER = com.outsystems.rd.spmtest;
359310
PRODUCT_NAME = "$(TARGET_NAME)";
311+
PROVISIONING_PROFILE_SPECIFIER = "";
312+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "OutSystems Engineering - Wildcard Development";
360313
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
361314
SWIFT_VERSION = 5.0;
362315
TARGETED_DEVICE_FAMILY = "1,2";
@@ -365,20 +318,23 @@
365318
};
366319
504EC3181FED79650016851F /* Release */ = {
367320
isa = XCBuildConfiguration;
368-
baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
369321
buildSettings = {
370322
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
371-
CODE_SIGN_IDENTITY = "Apple Development";
372-
CODE_SIGN_STYLE = Automatic;
323+
CODE_SIGN_STYLE = Manual;
373324
CURRENT_PROJECT_VERSION = 1;
374-
DEVELOPMENT_TEAM = F898TC6427;
325+
DEVELOPMENT_TEAM = "";
326+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EVSWK8BA55;
375327
INFOPLIST_FILE = App/Info.plist;
376328
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
377-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
329+
LD_RUNPATH_SEARCH_PATHS = (
330+
"$(inherited)",
331+
"@executable_path/Frameworks",
332+
);
378333
MARKETING_VERSION = 1.0;
379-
PRODUCT_BUNDLE_IDENTIFIER = com.outsystems.rd;
334+
PRODUCT_BUNDLE_IDENTIFIER = com.outsystems.rd.spmtest;
380335
PRODUCT_NAME = "$(TARGET_NAME)";
381336
PROVISIONING_PROFILE_SPECIFIER = "";
337+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "OutSystems Engineering - Wildcard Development";
382338
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
383339
SWIFT_VERSION = 5.0;
384340
TARGETED_DEVICE_FAMILY = "1,2";
@@ -407,6 +363,21 @@
407363
defaultConfigurationName = Release;
408364
};
409365
/* End XCConfigurationList section */
366+
367+
/* Begin XCLocalSwiftPackageReference section */
368+
D4C12C0A2AAA248700AAC8A2 /* XCLocalSwiftPackageReference "CapApp-SPM" */ = {
369+
isa = XCLocalSwiftPackageReference;
370+
relativePath = "CapApp-SPM";
371+
};
372+
/* End XCLocalSwiftPackageReference section */
373+
374+
/* Begin XCSwiftPackageProductDependency section */
375+
4D22ABE82AF431CB00220026 /* CapApp-SPM */ = {
376+
isa = XCSwiftPackageProductDependency;
377+
package = D4C12C0A2AAA248700AAC8A2 /* XCLocalSwiftPackageReference "CapApp-SPM" */;
378+
productName = "CapApp-SPM";
379+
};
380+
/* End XCSwiftPackageProductDependency section */
410381
};
411382
rootObject = 504EC2FC1FED79650016851F /* Project object */;
412383
}

‎example-app/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

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

‎example-app/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎ renamed to ‎example-app/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

File renamed without changes.

‎example-app/ios/App/App.xcworkspace/contents.xcworkspacedata‎

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

‎example-app/ios/App/App/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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>

‎example-app/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

‎example-app/ios/App/CapApp-SPM/Package.swift‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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(.v13)],
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", branch: "main"),
15+
.package(name: "CapacitorApp", path: "../../../node_modules/@capacitor/app"),
16+
.package(name: "CapacitorHaptics", path: "../../../node_modules/@capacitor/haptics"),
17+
.package(name: "CapacitorInappbrowser", path: "../../../node_modules/@capacitor/inappbrowser"),
18+
.package(name: "CapacitorKeyboard", path: "../../../node_modules/@capacitor/keyboard"),
19+
.package(name: "CapacitorStatusBar", path: "../../../node_modules/@capacitor/status-bar")
20+
],
21+
targets: [
22+
.target(
23+
name: "CapApp-SPM",
24+
dependencies: [
25+
.product(name: "Capacitor", package: "capacitor-swift-pm"),
26+
.product(name: "Cordova", package: "capacitor-swift-pm"),
27+
.product(name: "CapacitorApp", package: "CapacitorApp"),
28+
.product(name: "CapacitorHaptics", package: "CapacitorHaptics"),
29+
.product(name: "CapacitorInappbrowser", package: "CapacitorInappbrowser"),
30+
.product(name: "CapacitorKeyboard", package: "CapacitorKeyboard"),
31+
.product(name: "CapacitorStatusBar", package: "CapacitorStatusBar")
32+
]
33+
)
34+
]
35+
)

‎example-app/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.

‎example-app/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

‎example-app/ios/App/Podfile‎

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

0 commit comments

Comments
 (0)