diff --git a/apps/skolplattformen-sthlm/ios/Podfile.lock b/apps/skolplattformen-sthlm/ios/Podfile.lock index 64883f88..fef1aa99 100644 --- a/apps/skolplattformen-sthlm/ios/Podfile.lock +++ b/apps/skolplattformen-sthlm/ios/Podfile.lock @@ -1,5 +1,6 @@ PODS: - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.65.1) - FBReactNativeSpec (0.65.1): @@ -9,10 +10,71 @@ PODS: - React-Core (= 0.65.1) - React-jsi (= 0.65.1) - ReactCommon/turbomodule/core (= 0.65.1) + - Flipper (0.93.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.1.7) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.7): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.180) + - Flipper-Glog (0.3.6) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.93.0): + - FlipperKit/Core (= 0.93.0) + - FlipperKit/Core (0.93.0): + - Flipper (~> 0.93.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - FlipperKit/CppBridge (0.93.0): + - Flipper (~> 0.93.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.93.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.93.0) + - FlipperKit/FKPortForwarding (0.93.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.93.0) + - FlipperKit/FlipperKitLayoutHelpers (0.93.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.93.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.93.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.93.0) + - FlipperKit/FlipperKitNetworkPlugin (0.93.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.93.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.93.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.93.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - hermes-engine (0.8.1) - libevent (2.1.12) + - OpenSSL-Universal (1.1.180) - RCT-Folly (2021.04.26.00): - boost-for-react-native - DoubleConversion @@ -350,15 +412,38 @@ PODS: - RNScreens (3.8.0): - React-Core - React-RCTImage - - RNSVG (12.1.0): + - RNSVG (12.1.1): - React - Toast (4.0.0) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - DoubleConversion (from `../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../../../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../../../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.93.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.1.7) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.7) + - Flipper-Glog (= 0.3.6) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.93.0) + - FlipperKit/Core (= 0.93.0) + - FlipperKit/CppBridge (= 0.93.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.93.0) + - FlipperKit/FBDefines (= 0.93.0) + - FlipperKit/FKPortForwarding (= 0.93.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.93.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.93.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.93.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.93.0) + - FlipperKit/FlipperKitReactPlugin (= 0.93.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.93.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.93.0) - glog (from `../../../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (~> 0.8.1) - libevent (~> 2.1.12) @@ -409,10 +494,22 @@ DEPENDENCIES: SPEC REPOS: trunk: - boost-for-react-native + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit - fmt - hermes-engine - libevent + - OpenSSL-Universal - Toast + - YogaKit EXTERNAL SOURCES: DoubleConversion: @@ -508,13 +605,24 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: 33c82491102f20ecddb6c6a2c273696ace3191e0 FBReactNativeSpec: df8f81d2a7541ee6755a047b398a5cb5a72acd0e + Flipper: b1fddf9a17c32097b2b4c806ad158b2f36bb2692 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a + Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 5337263514dd6f09803962437687240c5dc39aa4 hermes-engine: 7dcd1dbd908e6353bd7e4a4add72dba7bf76bf84 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 + OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46 RCTRequired: 6cf071ab2adfd769014b3d94373744ee6e789530 RCTTypeSafety: b829c59453478bb5b02487b8de3336386ab93ab1 @@ -554,9 +662,10 @@ SPEC CHECKSUMS: RNLocalize: 74b82db20cc3895ccc25af992c644879bcec2815 RNReanimated: ad24db8af24e3fe1b5c462785bc3db8d5baae2ee RNScreens: 6e1ea5787989f92b0671049b808aef64fa1ef98c - RNSVG: ce9d996113475209013317e48b05c21ee988d42e + RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4 + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 85f5a2dfa1de342b427eecb6e9652410ad153247 diff --git a/apps/skolplattformen-sthlm/ios/app.xcodeproj/project.pbxproj b/apps/skolplattformen-sthlm/ios/app.xcodeproj/project.pbxproj index 25214c4c..d3fb1edd 100644 --- a/apps/skolplattformen-sthlm/ios/app.xcodeproj/project.pbxproj +++ b/apps/skolplattformen-sthlm/ios/app.xcodeproj/project.pbxproj @@ -573,10 +573,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -591,10 +595,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -971,7 +979,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1033,7 +1041,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/apps/skolplattformen-sthlm/package.json b/apps/skolplattformen-sthlm/package.json index fb0ad2d7..e336a5f2 100644 --- a/apps/skolplattformen-sthlm/package.json +++ b/apps/skolplattformen-sthlm/package.json @@ -77,6 +77,8 @@ "valtio": "*", "yup": "*" }, - "devDependencies": {}, + "devDependencies": { + "react-native-clean-project": "*" + }, "private": true } diff --git a/package.json b/package.json index ea32f515..f6ca7056 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "react-native-safe-area-context": "^3.2.0", "react-native-screens": "^3.3.0", "react-native-simple-toast": "1.1.3", - "react-native-svg": "12.1.0", + "react-native-svg": "12.1.1", "react-native-typography": "1.4.1", "react-native-webview": "11.4.2", "react-redux": "^7.2.3", @@ -128,6 +128,7 @@ "node-blob": "^0.0.2", "node-fetch": "^2.6.1", "prettier": "^2.3.1", + "react-native-clean-project": "^3.6.7", "react-native-codegen": "0.0.7", "react-native-oss-license": "^0.4.1", "react-native-svg": "12.1.1", diff --git a/yarn.lock b/yarn.lock index 33242754..1f60ea52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12034,6 +12034,11 @@ react-native-calendar-events@2.2.0: resolved "https://registry.npmjs.org/react-native-calendar-events/-/react-native-calendar-events-2.2.0.tgz" integrity sha512-tNUbhT6Ief0JM4OQzQAaz1ri0+MCcAoHptBcEXCz2g7q3A05pg62PR2Dio4F9t2fCAD7Y2+QggdY1ycAsF3Tsg== +react-native-clean-project@^3.6.7: + version "3.6.7" + resolved "https://registry.yarnpkg.com/react-native-clean-project/-/react-native-clean-project-3.6.7.tgz#6d22ad22fe3a1e6efdb040eb66f9bdfb2273ac2e" + integrity sha512-GSJG1oNRJKtINPMzfHgRmu7HJs7phwgtwQ6GvyGARiySqQlU/bAc5zsI9rOeNPGlpgYongQtjOGdmqSpsWMJTw== + react-native-codegen@0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/react-native-codegen/-/react-native-codegen-0.0.7.tgz" @@ -12163,10 +12168,10 @@ react-native-svg-transformer@0.14.3: path-dirname "^1.0.2" semver "^5.6.0" -react-native-svg@12.1.0: - version "12.1.0" - resolved "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.1.0.tgz" - integrity sha512-1g9qBRci7man8QsHoXn6tP3DhCDiypGgc6+AOWq+Sy+PmP6yiyf8VmvKuoqrPam/tf5x+ZaBT2KI0gl7bptZ7w== +react-native-svg@12.1.1: + version "12.1.1" + resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-12.1.1.tgz#5f292410b8bcc07bbc52b2da7ceb22caf5bcaaee" + integrity sha512-NIAJ8jCnXGCqGWXkkJ1GTzO4a3Md5at5sagYV8Vh4MXYnL4z5Rh428Wahjhh+LIjx40EE5xM5YtwyJBqOIba2Q== dependencies: css-select "^2.1.0" css-tree "^1.0.0-alpha.39"