Skip to content

Commit bf994a5

Browse files
updated to latest version of capacitor and ionic/react
1 parent 60e4989 commit bf994a5

12 files changed

+7126
-5072
lines changed

capacitor.config.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"appName": "reactionicfb",
44
"bundledWebRuntime": false,
55
"npmClient": "npm",
6-
"webDir": "build"
6+
"webDir": "build",
7+
"cordova": {}
78
}

ionic.config.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "reactionicfb",
3+
"integrations": {
4+
"capacitor": {}
5+
},
6+
"type": "react"
7+
}
8+

ios/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
App/build
66
App/Pods
77
App/public
8+
App/Podfile.lock
89
xcuserdata
910

1011
# Cordova plugins for Capacitor

ios/App/App.xcodeproj/project.pbxproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
TargetAttributes = {
128128
504EC3031FED79650016851F = {
129129
CreatedOnToolsVersion = 9.2;
130+
LastSwiftMigration = 1100;
130131
ProvisioningStyle = Automatic;
131132
};
132133
};
@@ -190,18 +191,13 @@
190191
files = (
191192
);
192193
inputPaths = (
193-
"${SRCROOT}/Pods/Target Support Files/Pods-App/Pods-App-frameworks.sh",
194-
"${BUILT_PRODUCTS_DIR}/Capacitor/Capacitor.framework",
195-
"${BUILT_PRODUCTS_DIR}/CapacitorCordova/Cordova.framework",
196194
);
197195
name = "[CP] Embed Pods Frameworks";
198196
outputPaths = (
199-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Capacitor.framework",
200-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cordova.framework",
201197
);
202198
runOnlyForDeploymentPostprocessing = 0;
203199
shellPath = /bin/sh;
204-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
200+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
205201
showEnvVarsInLog = 0;
206202
};
207203
/* End PBXShellScriptBuildPhase section */
@@ -357,7 +353,7 @@
357353
PRODUCT_BUNDLE_IDENTIFIER = com.aks.reactionicfb;
358354
PRODUCT_NAME = "$(TARGET_NAME)";
359355
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
360-
SWIFT_VERSION = 4.2;
356+
SWIFT_VERSION = 5.0;
361357
TARGETED_DEVICE_FAMILY = "1,2";
362358
};
363359
name = Debug;
@@ -374,7 +370,7 @@
374370
PRODUCT_BUNDLE_IDENTIFIER = com.aks.reactionicfb;
375371
PRODUCT_NAME = "$(TARGET_NAME)";
376372
SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
377-
SWIFT_VERSION = 4.2;
373+
SWIFT_VERSION = 5.0;
378374
TARGETED_DEVICE_FAMILY = "1,2";
379375
};
380376
name = Release;

ios/App/App/capacitor.config.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"appName": "reactionicfb",
44
"bundledWebRuntime": false,
55
"npmClient": "npm",
6-
"webDir": "build"
6+
"webDir": "build",
7+
"cordova": {}
78
}

ios/App/App/config.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<access origin="*" />
44

5-
</widget>
5+
6+
</widget>

ios/App/Podfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
platform :ios, '11.0'
22
use_frameworks!
33

4-
# workaround to avoid Xcode 10 caching of Pods that requires
4+
# workaround to avoid Xcode caching of Pods that requires
55
# Product -> Clean Build Folder after new Cordova plugins installed
66
# Requires CocoaPods 1.6 or newer
7-
install! 'cocoapods',
8-
# :disable_input_output_paths => true
7+
install! 'cocoapods', :disable_input_output_paths => true
98

109
def capacitor_pods
1110
# Automatic Capacitor Pod dependencies, do not delete

ios/App/Podfile.lock

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PODS:
2-
- Capacitor (1.0.0-beta.23):
3-
- CapacitorCordova (= 1.0.0-beta.23)
4-
- CapacitorCordova (1.0.0-beta.23)
2+
- Capacitor (2.0.1):
3+
- CapacitorCordova (= 2.0.1)
4+
- CapacitorCordova (2.0.1)
55

66
DEPENDENCIES:
77
- "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
1414
:path: "../../node_modules/@capacitor/ios"
1515

1616
SPEC CHECKSUMS:
17-
Capacitor: b6d4babf85504642196d8fe1c73a6f3d439fa9b0
18-
CapacitorCordova: 07a15ab2a299d8d275463c6cafa49062e128aedd
17+
Capacitor: 893baa42b33635ddf23d29d23d2a7f33f7c08bc7
18+
CapacitorCordova: 9fee2eb6780331b6ff09710d6a7d1f2e4707f1b9
1919

20-
PODFILE CHECKSUM: f8b6f0374a33d3b2bb9de734569411be27010db4
20+
PODFILE CHECKSUM: fb75b5ffc60ff2a7ae6a369fac21a8cbd40a9ff8
2121

22-
COCOAPODS: 1.5.3
22+
COCOAPODS: 1.9.0.beta.3

0 commit comments

Comments
 (0)