From 963531095fcdc44bccb781b1a0cf0864d2791244 Mon Sep 17 00:00:00 2001 From: Serge Muhundu Date: Wed, 15 Nov 2023 22:01:49 +0100 Subject: [PATCH] fix build errors for ios and android --- apps/mobile/app.json | 12 +++++++++++- apps/mobile/ios/GauzyTeams/Info.plist | 2 ++ apps/mobile/ios/Podfile.lock | 6 ++++++ apps/mobile/package.json | 1 + apps/mobile/yarn.lock | 10 +++++++++- 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/apps/mobile/app.json b/apps/mobile/app.json index fb8bbd820..59845eaf0 100644 --- a/apps/mobile/app.json +++ b/apps/mobile/app.json @@ -28,7 +28,17 @@ "isAccessMediaLocationEnabled": true } ], - "sentry-expo" + "sentry-expo", + [ + "expo-build-properties", + { + "android": { + "enableProguardInReleaseBuilds": true, + "extraProguardRules": "-keep public class com.horcrux.svg.** {*;}", + "allowBackup": false + } + } + ] ], "android": { "icon": "./assets/images/app-icon-android-legacy-ever-teams.png", diff --git a/apps/mobile/ios/GauzyTeams/Info.plist b/apps/mobile/ios/GauzyTeams/Info.plist index efef41b0f..b42e39212 100644 --- a/apps/mobile/ios/GauzyTeams/Info.plist +++ b/apps/mobile/ios/GauzyTeams/Info.plist @@ -80,5 +80,7 @@ Light UIViewControllerBasedStatusBarAppearance + ITSAppUsesNonExemptEncryption + diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock index 73c4e1c48..b97a4c06a 100644 --- a/apps/mobile/ios/Podfile.lock +++ b/apps/mobile/ios/Podfile.lock @@ -327,6 +327,8 @@ PODS: - RCTTypeSafety - React-Core - ReactCommon/turbomodule/core + - react-native-webview (11.23.1): + - React-Core - React-perflogger (0.71.8) - React-RCTActionSheet (0.71.8): - React-Core/RCTActionSheetHeaders (= 0.71.8) @@ -504,6 +506,7 @@ DEPENDENCIES: - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - react-native-pager-view (from `../node_modules/react-native-pager-view`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - react-native-webview (from `../node_modules/react-native-webview`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) @@ -623,6 +626,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-pager-view" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" + react-native-webview: + :path: "../node_modules/react-native-webview" React-perflogger: :path: "../node_modules/react-native/ReactCommon/reactperflogger" React-RCTActionSheet: @@ -716,6 +721,7 @@ SPEC CHECKSUMS: React-logger: 342f358b8decfbf8f272367f4eacf4b6154061be react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43 react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc + react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581 React-perflogger: d21f182895de9d1b077f8a3cd00011095c8c9100 React-RCTActionSheet: 0151f83ef92d2a7139bba7dfdbc8066632a6d47b React-RCTAnimation: 5ec9c0705bb2297549c120fe6473aa3e4a01e215 diff --git a/apps/mobile/package.json b/apps/mobile/package.json index a45a3a8ec..5b337edb0 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -58,6 +58,7 @@ "expo": "~48.0.9", "expo-application": "~5.1.1", "expo-blur": "~12.2.2", + "expo-build-properties": "~0.6.0", "expo-clipboard": "~4.1.2", "expo-constants": "~14.2.1", "expo-device": "~5.2.1", diff --git a/apps/mobile/yarn.lock b/apps/mobile/yarn.lock index 1d56fa3d0..7d2f79106 100644 --- a/apps/mobile/yarn.lock +++ b/apps/mobile/yarn.lock @@ -3452,7 +3452,7 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.1.0, ajv@^8.6.3, ajv@^8.8.0: +ajv@^8.0.0, ajv@^8.1.0, ajv@^8.11.0, ajv@^8.6.3, ajv@^8.8.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -6338,6 +6338,14 @@ expo-blur@~12.2.2: resolved "https://registry.yarnpkg.com/expo-blur/-/expo-blur-12.2.2.tgz#b7f94499255afbd3468302d02f3c4e39a0e562d5" integrity sha512-SvGbEZbB0VFNGqCW7FcqzWOEb3lrRgBnQKGrsKo49KwhMyHTYjYVYWnmrk9l8Tr7lIaNnd55QD6dPAzcXjZYMg== +expo-build-properties@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/expo-build-properties/-/expo-build-properties-0.6.0.tgz#164e45c9008464a75bc54c74cf251901d924b141" + integrity sha512-J9129dDhZp9Av/RctdpGUaC8eMgFcfKpmBpvwstr/2jKL5aaH8noJP1xbXw/xrDXmGm+YyjhVzRJjLbf0qAmJA== + dependencies: + ajv "^8.11.0" + semver "^7.3.5" + expo-clipboard@~4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/expo-clipboard/-/expo-clipboard-4.1.2.tgz#0844566ae8ad1cf72854dc1bbd704c3b09c5d391"