Skip to content

Commit 8db53d6

Browse files
johnborgesjohnborges
authored
Merge pull request #20 from capacitor-community/capv4-support
adding support for Capacitor v4
2 parents 8f01802 + 7c75c18 commit 8db53d6

File tree

12 files changed

+5445
-599
lines changed

12 files changed

+5445
-599
lines changed

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
build
2+
dist

‎CapacitorCommunityAppIcon.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '12.0'
14+
s.ios.deployment_target = '13.0'
1515
s.dependency 'Capacitor'
1616
s.swift_version = '5.1'
1717
end

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

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
6C75BC60260956AB001D6D8C /* ionitron-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C75BC5F260956AB001D6D8C /* ionitron-icon.png */; };
1818
6C75BC6426095757001D6D8C /* ionic-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C75BC6326095757001D6D8C /* ionic-icon.png */; };
1919
6CA96339260938650052EF08 /* public in Resources */ = {isa = PBXBuildFile; fileRef = 6CA96338260938650052EF08 /* public */; };
20-
A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
20+
E0919CDF06B2B78F5AC5638D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8494654FAA1E2CBFD35BBD68 /* Pods_App.framework */; };
2121
/* End PBXBuildFile section */
2222

2323
/* Begin PBXFileReference section */
@@ -33,27 +33,27 @@
3333
6C75BC5F260956AB001D6D8C /* ionitron-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ionitron-icon.png"; path = "../../../../src/assets/icon/ionitron-icon.png"; sourceTree = "<group>"; };
3434
6C75BC6326095757001D6D8C /* ionic-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ionic-icon.png"; path = "../../../../src/assets/icon/ionic-icon.png"; sourceTree = "<group>"; };
3535
6CA96338260938650052EF08 /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
36-
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
37-
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>"; };
38-
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>"; };
36+
8494654FAA1E2CBFD35BBD68 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
37+
B43B80CC6554ED2F938B29AE /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
38+
EB22F58BE931B312E0E183B8 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
3939
/* End PBXFileReference section */
4040

4141
/* Begin PBXFrameworksBuildPhase section */
4242
504EC3011FED79650016851F /* Frameworks */ = {
4343
isa = PBXFrameworksBuildPhase;
4444
buildActionMask = 2147483647;
4545
files = (
46-
A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
46+
E0919CDF06B2B78F5AC5638D /* Pods_App.framework in Frameworks */,
4747
);
4848
runOnlyForDeploymentPostprocessing = 0;
4949
};
5050
/* End PBXFrameworksBuildPhase section */
5151

5252
/* Begin PBXGroup section */
53-
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
53+
05836EC4638B2CA23605C6D7 /* Frameworks */ = {
5454
isa = PBXGroup;
5555
children = (
56-
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
56+
8494654FAA1E2CBFD35BBD68 /* Pods_App.framework */,
5757
);
5858
name = Frameworks;
5959
sourceTree = "<group>";
@@ -63,8 +63,8 @@
6363
children = (
6464
504EC3061FED79650016851F /* App */,
6565
504EC3051FED79650016851F /* Products */,
66-
7F8756D8B27F46E3366F6CEA /* Pods */,
67-
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
66+
BD0A62101659FC9DE8009DE3 /* Pods */,
67+
05836EC4638B2CA23605C6D7 /* Frameworks */,
6868
);
6969
sourceTree = "<group>";
7070
};
@@ -102,13 +102,14 @@
102102
path = AlternateIcons;
103103
sourceTree = "<group>";
104104
};
105-
7F8756D8B27F46E3366F6CEA /* Pods */ = {
105+
BD0A62101659FC9DE8009DE3 /* Pods */ = {
106106
isa = PBXGroup;
107107
children = (
108-
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
109-
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
108+
B43B80CC6554ED2F938B29AE /* Pods-App.debug.xcconfig */,
109+
EB22F58BE931B312E0E183B8 /* Pods-App.release.xcconfig */,
110110
);
111111
name = Pods;
112+
path = Pods;
112113
sourceTree = "<group>";
113114
};
114115
/* End PBXGroup section */
@@ -118,11 +119,11 @@
118119
isa = PBXNativeTarget;
119120
buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
120121
buildPhases = (
121-
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
122+
C7796A0A5336ADCBB6E020E9 /* [CP] Check Pods Manifest.lock */,
122123
504EC3001FED79650016851F /* Sources */,
123124
504EC3011FED79650016851F /* Frameworks */,
124125
504EC3021FED79650016851F /* Resources */,
125-
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
126+
9059E659B2B63824B8385601 /* [CP] Embed Pods Frameworks */,
126127
);
127128
buildRules = (
128129
);
@@ -187,37 +188,41 @@
187188
/* End PBXResourcesBuildPhase section */
188189

189190
/* Begin PBXShellScriptBuildPhase section */
190-
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
191+
9059E659B2B63824B8385601 /* [CP] Embed Pods Frameworks */ = {
191192
isa = PBXShellScriptBuildPhase;
192193
buildActionMask = 2147483647;
193194
files = (
194195
);
195196
inputPaths = (
196-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
197-
"${PODS_ROOT}/Manifest.lock",
198197
);
199-
name = "[CP] Check Pods Manifest.lock";
198+
name = "[CP] Embed Pods Frameworks";
200199
outputPaths = (
201-
"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
202200
);
203201
runOnlyForDeploymentPostprocessing = 0;
204202
shellPath = /bin/sh;
205-
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";
203+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
206204
showEnvVarsInLog = 0;
207205
};
208-
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
206+
C7796A0A5336ADCBB6E020E9 /* [CP] Check Pods Manifest.lock */ = {
209207
isa = PBXShellScriptBuildPhase;
210208
buildActionMask = 2147483647;
211209
files = (
212210
);
211+
inputFileListPaths = (
212+
);
213213
inputPaths = (
214+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
215+
"${PODS_ROOT}/Manifest.lock",
216+
);
217+
name = "[CP] Check Pods Manifest.lock";
218+
outputFileListPaths = (
214219
);
215-
name = "[CP] Embed Pods Frameworks";
216220
outputPaths = (
221+
"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
217222
);
218223
runOnlyForDeploymentPostprocessing = 0;
219224
shellPath = /bin/sh;
220-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
225+
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";
221226
showEnvVarsInLog = 0;
222227
};
223228
/* End PBXShellScriptBuildPhase section */
@@ -301,7 +306,7 @@
301306
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
302307
GCC_WARN_UNUSED_FUNCTION = YES;
303308
GCC_WARN_UNUSED_VARIABLE = YES;
304-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
309+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
305310
MTL_ENABLE_DEBUG_INFO = YES;
306311
ONLY_ACTIVE_ARCH = YES;
307312
SDKROOT = iphoneos;
@@ -352,7 +357,7 @@
352357
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
353358
GCC_WARN_UNUSED_FUNCTION = YES;
354359
GCC_WARN_UNUSED_VARIABLE = YES;
355-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
360+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
356361
MTL_ENABLE_DEBUG_INFO = NO;
357362
SDKROOT = iphoneos;
358363
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -362,12 +367,12 @@
362367
};
363368
504EC3171FED79650016851F /* Debug */ = {
364369
isa = XCBuildConfiguration;
365-
baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
370+
baseConfigurationReference = B43B80CC6554ED2F938B29AE /* Pods-App.debug.xcconfig */;
366371
buildSettings = {
367372
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
368373
CODE_SIGN_STYLE = Automatic;
369374
INFOPLIST_FILE = App/Info.plist;
370-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
375+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
371376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
372377
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
373378
PRODUCT_BUNDLE_IDENTIFIER = com.example.app;
@@ -380,12 +385,12 @@
380385
};
381386
504EC3181FED79650016851F /* Release */ = {
382387
isa = XCBuildConfiguration;
383-
baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
388+
baseConfigurationReference = EB22F58BE931B312E0E183B8 /* Pods-App.release.xcconfig */;
384389
buildSettings = {
385390
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
386391
CODE_SIGN_STYLE = Automatic;
387392
INFOPLIST_FILE = App/Info.plist;
388-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
393+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
389394
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
390395
PRODUCT_BUNDLE_IDENTIFIER = com.example.app;
391396
PRODUCT_NAME = "$(TARGET_NAME)";

‎example/ios/App/Podfile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
platform :ios, '12.0'
1+
require_relative '../../../node_modules/@capacitor/ios/scripts/pods_helpers'
2+
3+
platform :ios, '13.0'
24
use_frameworks!
35

46
# workaround to avoid Xcode caching of Pods that requires
@@ -16,3 +18,7 @@ target 'App' do
1618
capacitor_pods
1719
# Add your Pods here
1820
end
21+
22+
post_install do |installer|
23+
assertDeploymentTarget(installer)
24+
end

0 commit comments

Comments
 (0)