From df171c9e39cf29cca27accafc4408656bce6af26 Mon Sep 17 00:00:00 2001 From: Tung Wu Date: Mon, 28 Oct 2024 20:52:30 +0800 Subject: [PATCH] Switch to WechatOpenSDK-XCFramework in example app --- example/reactnative/ios/Podfile | 8 +- example/reactnative/ios/Podfile.lock | 12 +- .../project.pbxproj | 116 +++++++++--------- .../ios/reactNativeExample/AppDelegate.h | 2 +- .../reactNativeExample/RCTWeChatAuthModule.m | 2 +- 5 files changed, 67 insertions(+), 73 deletions(-) diff --git a/example/reactnative/ios/Podfile b/example/reactnative/ios/Podfile index 94330f20..a5bc2e52 100644 --- a/example/reactnative/ios/Podfile +++ b/example/reactnative/ios/Podfile @@ -45,7 +45,9 @@ target 'reactNativeExample' do :app_path => "#{Pod::Config.instance.installation_root}/.." ) - pod 'WechatOpenSDK', '~> 2.0.4' + # Use WechatOpenSDK-XCFramework instead of WechatOpenSDK + # See https://developers.weixin.qq.com/community/develop/doc/000c62b9b0ccf8c1d65fa90b751001?blockType=1 + pod 'WechatOpenSDK-XCFramework', '~> 2.0.4' target 'reactNativeExampleTests' do inherit! :complete @@ -60,9 +62,5 @@ target 'reactNativeExample' do :mac_catalyst_enabled => false ) __apply_Xcode_12_5_M1_post_install_workaround(installer) - - installer.pods_project.build_configurations.each do |config| - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" - end end end diff --git a/example/reactnative/ios/Podfile.lock b/example/reactnative/ios/Podfile.lock index bdb19c03..1dd109b5 100644 --- a/example/reactnative/ios/Podfile.lock +++ b/example/reactnative/ios/Podfile.lock @@ -428,7 +428,7 @@ PODS: - React-logger (= 0.72.15) - React-perflogger (= 0.72.15) - SocketRocket (0.6.1) - - WechatOpenSDK (2.0.4) + - WechatOpenSDK-XCFramework (2.0.4) - Yoga (1.14.0) DEPENDENCIES: @@ -473,7 +473,7 @@ DEPENDENCIES: - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - WechatOpenSDK (~> 2.0.4) + - WechatOpenSDK-XCFramework (~> 2.0.4) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -481,7 +481,7 @@ SPEC REPOS: - fmt - libevent - SocketRocket - - WechatOpenSDK + - WechatOpenSDK-XCFramework EXTERNAL SOURCES: authgear-react-native: @@ -573,7 +573,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: e03b22fbf7017a6f76641ea4472e73c915dcdda7 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: b213bace5f31766ad1434d2d9b2cbf04cf92a2b6 + hermes-engine: 5b340c6a5affbf3aba22185be41563bbb2426654 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: fb207f74935626041e7308c9e88dcdda680f1073 @@ -608,9 +608,9 @@ SPEC CHECKSUMS: React-utils: 8eb3c12fd4a4da6df3824f7d9a961d73a6ed6e5d ReactCommon: d2de36ed3eebe700d7169b9e80f7d1a4b98e178d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - WechatOpenSDK: 290989072e87b79d52225a01bb4e5e58f6f88593 + WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f Yoga: 6f5ab94cd8b1ecd04b6e973d0bc583ede2a598cc -PODFILE CHECKSUM: bcf5c372799802016bc3855cf2d2bd83a3d1b246 +PODFILE CHECKSUM: e44a8b0a78596595a0a8e0e284c522da68edaec0 COCOAPODS: 1.15.2 diff --git a/example/reactnative/ios/reactNativeExample.xcodeproj/project.pbxproj b/example/reactnative/ios/reactNativeExample.xcodeproj/project.pbxproj index 96aeb452..455e7842 100644 --- a/example/reactnative/ios/reactNativeExample.xcodeproj/project.pbxproj +++ b/example/reactnative/ios/reactNativeExample.xcodeproj/project.pbxproj @@ -8,14 +8,14 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* reactNativeExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* reactNativeExampleTests.m */; }; - 0C80B921A6F3F58F76C31292 /* libPods-reactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-reactNativeExample.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 7699B88040F8A987B510C191 /* libPods-reactNativeExample-reactNativeExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-reactNativeExample-reactNativeExampleTests.a */; }; + 4EBC9487F3499752072072EF /* libPods-reactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 157685ABA753C0978453FC74 /* libPods-reactNativeExample.a */; }; 770B18702A6A67F300B6F503 /* RCTWeChatAuthModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 770B186F2A6A67EC00B6F503 /* RCTWeChatAuthModule.m */; }; 7769CB952C12E808009BB888 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 7769CB942C12E808009BB888 /* PrivacyInfo.xcprivacy */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + 91FBD1063F4E0051B4088E98 /* libPods-reactNativeExample-reactNativeExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B34DB6115BB3AB33DFBE92F /* libPods-reactNativeExample-reactNativeExampleTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -32,23 +32,23 @@ 00E356EE1AD99517003FC87E /* reactNativeExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = reactNativeExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* reactNativeExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = reactNativeExampleTests.m; sourceTree = ""; }; + 0C7CED91A5B1DB4F36984D1D /* Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig"; path = "Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* reactNativeExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = reactNativeExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = reactNativeExample/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = reactNativeExample/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = reactNativeExample/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = reactNativeExample/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = reactNativeExample/main.m; sourceTree = ""; }; - 19F6CBCC0A4E27FBF8BF4A61 /* libPods-reactNativeExample-reactNativeExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactNativeExample-reactNativeExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B4392A12AC88292D35C810B /* Pods-reactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample.debug.xcconfig"; sourceTree = ""; }; - 5709B34CF0A7D63546082F79 /* Pods-reactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample.release.xcconfig"; sourceTree = ""; }; - 5B7EB9410499542E8C5724F5 /* Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig"; sourceTree = ""; }; - 5DCACB8F33CDC322A6C60F78 /* libPods-reactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 157685ABA753C0978453FC74 /* libPods-reactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1B34DB6115BB3AB33DFBE92F /* libPods-reactNativeExample-reactNativeExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-reactNativeExample-reactNativeExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 751FDC65E7F71F5D683D44EC /* Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig"; sourceTree = ""; }; 770B186D2A6A651600B6F503 /* reactNativeExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = reactNativeExample.entitlements; path = reactNativeExample/reactNativeExample.entitlements; sourceTree = ""; }; 770B186E2A6A67E000B6F503 /* RCTWeChatAuthModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTWeChatAuthModule.h; path = reactNativeExample/RCTWeChatAuthModule.h; sourceTree = ""; }; 770B186F2A6A67EC00B6F503 /* RCTWeChatAuthModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTWeChatAuthModule.m; path = reactNativeExample/RCTWeChatAuthModule.m; sourceTree = ""; }; 7769CB942C12E808009BB888 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = reactNativeExample/PrivacyInfo.xcprivacy; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = reactNativeExample/LaunchScreen.storyboard; sourceTree = ""; }; - 89C6BE57DB24E9ADA2F236DE /* Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig"; path = "Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig"; sourceTree = ""; }; + 9AAA383AC63115318196762D /* Pods-reactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample.release.xcconfig"; sourceTree = ""; }; + EA9581A67CF2EE3EC5ABBBEB /* Pods-reactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-reactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -57,7 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7699B88040F8A987B510C191 /* libPods-reactNativeExample-reactNativeExampleTests.a in Frameworks */, + 91FBD1063F4E0051B4088E98 /* libPods-reactNativeExample-reactNativeExampleTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -65,7 +65,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0C80B921A6F3F58F76C31292 /* libPods-reactNativeExample.a in Frameworks */, + 4EBC9487F3499752072072EF /* libPods-reactNativeExample.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,8 +110,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 5DCACB8F33CDC322A6C60F78 /* libPods-reactNativeExample.a */, - 19F6CBCC0A4E27FBF8BF4A61 /* libPods-reactNativeExample-reactNativeExampleTests.a */, + 157685ABA753C0978453FC74 /* libPods-reactNativeExample.a */, + 1B34DB6115BB3AB33DFBE92F /* libPods-reactNativeExample-reactNativeExampleTests.a */, ); name = Frameworks; sourceTree = ""; @@ -151,10 +151,10 @@ isa = PBXGroup; children = ( 832341AE1AAA6A7D00B99B32 /* Libraries */, - 3B4392A12AC88292D35C810B /* Pods-reactNativeExample.debug.xcconfig */, - 5709B34CF0A7D63546082F79 /* Pods-reactNativeExample.release.xcconfig */, - 5B7EB9410499542E8C5724F5 /* Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig */, - 89C6BE57DB24E9ADA2F236DE /* Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig */, + EA9581A67CF2EE3EC5ABBBEB /* Pods-reactNativeExample.debug.xcconfig */, + 9AAA383AC63115318196762D /* Pods-reactNativeExample.release.xcconfig */, + 751FDC65E7F71F5D683D44EC /* Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig */, + 0C7CED91A5B1DB4F36984D1D /* Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -166,12 +166,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "reactNativeExampleTests" */; buildPhases = ( - A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */, + E7DF933DDEFB625F1017D74F /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */, - 619BDC491CF02D1294B12BF7 /* [CP] Embed Pods Frameworks */, + 9DC151C69C9C745FFE5D3306 /* [CP] Embed Pods Frameworks */, + A913D34B4A3220D9777BD171 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -187,14 +187,14 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "reactNativeExample" */; buildPhases = ( - C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */, + 56D2F712390B3B4C5C779AB7 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - E235C05ADACE081382539298 /* [CP] Copy Pods Resources */, - 02BAF242239EF5E5761790D6 /* [CP] Embed Pods Frameworks */, + 30E38FF4528EC3A7EA786801 /* [CP] Embed Pods Frameworks */, + 2C6ABBD2F701BF7700D16D27 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -278,43 +278,41 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 02BAF242239EF5E5761790D6 /* [CP] Embed Pods Frameworks */ = { + 2C6ABBD2F701BF7700D16D27 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 619BDC491CF02D1294B12BF7 /* [CP] Embed Pods Frameworks */ = { + 30E38FF4528EC3A7EA786801 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = { + 56D2F712390B3B4C5C779AB7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -329,69 +327,67 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-reactNativeExample-reactNativeExampleTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-reactNativeExample-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; 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"; showEnvVarsInLog = 0; }; - C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = { + 9DC151C69C9C745FFE5D3306 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-reactNativeExample-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = { + A913D34B4A3220D9777BD171 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample/Pods-reactNativeExample-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = { + E7DF933DDEFB625F1017D74F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-reactNativeExample-reactNativeExampleTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-reactNativeExample-reactNativeExampleTests/Pods-reactNativeExample-reactNativeExampleTests-resources.sh\"\n"; + 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"; showEnvVarsInLog = 0; }; FD10A7F022414F080027D42C /* Start Packager */ = { @@ -447,7 +443,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig */; + baseConfigurationReference = 751FDC65E7F71F5D683D44EC /* Pods-reactNativeExample-reactNativeExampleTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -474,7 +470,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig */; + baseConfigurationReference = 0C7CED91A5B1DB4F36984D1D /* Pods-reactNativeExample-reactNativeExampleTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; @@ -498,7 +494,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-reactNativeExample.debug.xcconfig */; + baseConfigurationReference = EA9581A67CF2EE3EC5ABBBEB /* Pods-reactNativeExample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -531,7 +527,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-reactNativeExample.release.xcconfig */; + baseConfigurationReference = 9AAA383AC63115318196762D /* Pods-reactNativeExample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/example/reactnative/ios/reactNativeExample/AppDelegate.h b/example/reactnative/ios/reactNativeExample/AppDelegate.h index c17f03cd..6eaf1c24 100644 --- a/example/reactnative/ios/reactNativeExample/AppDelegate.h +++ b/example/reactnative/ios/reactNativeExample/AppDelegate.h @@ -1,6 +1,6 @@ #import #import -#import "WXApi.h" +#import @interface AppDelegate : RCTAppDelegate diff --git a/example/reactnative/ios/reactNativeExample/RCTWeChatAuthModule.m b/example/reactnative/ios/reactNativeExample/RCTWeChatAuthModule.m index 4c299dba..44eedf12 100644 --- a/example/reactnative/ios/reactNativeExample/RCTWeChatAuthModule.m +++ b/example/reactnative/ios/reactNativeExample/RCTWeChatAuthModule.m @@ -1,7 +1,7 @@ #import "RCTWechatAuthModule.h" #import -#import "WXApi.h" +#import @interface RCTWechatAuthModule() @property (nonatomic, strong) RCTPromiseResolveBlock sendWechatAuthResolve;