stash
This commit is contained in:
Diego Mello
parent
afe50aed7e
commit
17f67a49a8
|
|
@ -1,6 +0,0 @@
|
|||
|
||||
[android]
|
||||
target = Google Inc.:Google APIs:23
|
||||
|
||||
[maven_repositories]
|
||||
central = https://repo1.maven.org/maven2
|
||||
|
|
@ -20,11 +20,18 @@ DerivedData
|
|||
*.hmap
|
||||
*.ipa
|
||||
*.xcuserstate
|
||||
ios/.xcode.env.local
|
||||
project.xcworkspace
|
||||
*.mobileprovision
|
||||
ios/Pods/
|
||||
/vendor/bundle/
|
||||
|
||||
# Temporary files created by Metro to check the health of the file watcher
|
||||
.metro-health-check*
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# Android/IntelliJ
|
||||
#
|
||||
build/
|
||||
|
|
@ -32,6 +39,10 @@ build/
|
|||
.gradle
|
||||
local.properties
|
||||
*.iml
|
||||
*.hprof
|
||||
.cxx/
|
||||
*.keystore
|
||||
!debug.keystore
|
||||
|
||||
# node.js
|
||||
#
|
||||
|
|
@ -39,14 +50,6 @@ node_modules/
|
|||
npm-debug.log
|
||||
yarn-error.log
|
||||
|
||||
coverage/
|
||||
|
||||
# BUCK
|
||||
buck-out/
|
||||
\.buckd/
|
||||
*.keystore
|
||||
*.jks
|
||||
|
||||
# fastlane
|
||||
#
|
||||
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
2.7.7
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -17,7 +17,7 @@ export const useFrequentlyUsedEmoji = (
|
|||
useEffect(() => {
|
||||
const getFrequentlyUsedEmojis = async () => {
|
||||
const db = database.active;
|
||||
const frequentlyUsedRecords = await db.get('frequently_used_emojis').query(Q.experimentalSortBy('count', Q.desc)).fetch();
|
||||
const frequentlyUsedRecords = await db.get('frequently_used_emojis').query(Q.sortBy('count', Q.desc)).fetch();
|
||||
let frequentlyUsedEmojis = frequentlyUsedRecords.map(item => {
|
||||
if (item.isCustom) {
|
||||
return { name: item.content, extension: item.extension! }; // if isCustom is true, extension is not null
|
||||
|
|
|
|||
|
|
@ -120,11 +120,7 @@ class AudioManagerClass {
|
|||
const msg = await getMessageById(msgId);
|
||||
if (msg) {
|
||||
const db = database.active;
|
||||
const whereClause: Q.Clause[] = [
|
||||
Q.experimentalSortBy('ts', Q.asc),
|
||||
Q.where('ts', Q.gt(moment(msg.ts).valueOf())),
|
||||
Q.experimentalTake(1)
|
||||
];
|
||||
const whereClause: Q.Clause[] = [Q.sortBy('ts', Q.asc), Q.where('ts', Q.gt(moment(msg.ts).valueOf())), Q.take(1)];
|
||||
|
||||
if (msg.tmid) {
|
||||
whereClause.push(Q.where('tmid', msg.tmid || msg.id));
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ export const localSearchSubscription = async ({
|
|||
Q.where('name', Q.like(`%${likeString}%`)),
|
||||
Q.where('fname', Q.like(`%${likeString}%`))
|
||||
),
|
||||
Q.experimentalSortBy('room_updated_at', Q.desc)
|
||||
Q.sortBy('room_updated_at', Q.desc)
|
||||
)
|
||||
.fetch();
|
||||
|
||||
|
|
@ -83,8 +83,8 @@ export const localSearchUsersMessageByRid = async ({ text = '', rid = '' }): Pro
|
|||
.get('messages')
|
||||
.query(
|
||||
Q.and(Q.where('rid', rid), Q.where('u', Q.notLike(`%${userId}%`)), Q.where('t', null)),
|
||||
Q.experimentalSortBy('ts', Q.desc),
|
||||
Q.experimentalTake(50)
|
||||
Q.sortBy('ts', Q.desc),
|
||||
Q.take(50)
|
||||
)
|
||||
.fetch();
|
||||
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@ const AddExistingChannelView = () => {
|
|||
Q.where('team_id', ''),
|
||||
Q.where('t', Q.oneOf(['c', 'p'])),
|
||||
Q.where('name', Q.like(`%${stringToSearch}%`)),
|
||||
Q.experimentalTake(QUERY_SIZE),
|
||||
Q.experimentalSortBy('room_updated_at', Q.desc)
|
||||
Q.take(QUERY_SIZE),
|
||||
Q.sortBy('room_updated_at', Q.desc)
|
||||
)
|
||||
.fetch();
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const NewMessageView = () => {
|
|||
const db = database.active;
|
||||
const c = await db
|
||||
.get('subscriptions')
|
||||
.query(Q.where('t', 'd'), Q.experimentalTake(QUERY_SIZE), Q.experimentalSortBy('room_updated_at', Q.desc))
|
||||
.query(Q.where('t', 'd'), Q.take(QUERY_SIZE), Q.sortBy('room_updated_at', Q.desc))
|
||||
.fetch();
|
||||
setChats(c);
|
||||
} catch (e) {
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
|
|||
const db = database.servers;
|
||||
try {
|
||||
const serversHistoryCollection = db.get('servers_history');
|
||||
let whereClause = [Q.where('username', Q.notEq(null)), Q.experimentalSortBy('updated_at', Q.desc), Q.experimentalTake(3)];
|
||||
let whereClause = [Q.where('username', Q.notEq(null)), Q.sortBy('updated_at', Q.desc), Q.take(3)];
|
||||
if (text) {
|
||||
const likeString = sanitizeLikeString(text);
|
||||
whereClause = [...whereClause, Q.where('url', Q.like(`%${likeString}%`))];
|
||||
|
|
|
|||
|
|
@ -743,8 +743,8 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
|
|||
.query(
|
||||
Q.where('team_main', true),
|
||||
Q.where('name', Q.like(`%${onChangeText}%`)),
|
||||
Q.experimentalTake(QUERY_SIZE),
|
||||
Q.experimentalSortBy('room_updated_at', Q.desc)
|
||||
Q.take(QUERY_SIZE),
|
||||
Q.sortBy('room_updated_at', Q.desc)
|
||||
)
|
||||
.fetch();
|
||||
|
||||
|
|
|
|||
|
|
@ -50,15 +50,13 @@ export const useMessages = ({
|
|||
}
|
||||
observable = db
|
||||
.get('thread_messages')
|
||||
.query(Q.where('rid', tmid), Q.experimentalSortBy('ts', Q.desc), Q.experimentalSkip(0), Q.experimentalTake(count.current))
|
||||
.query(Q.where('rid', tmid), Q.sortBy('ts', Q.desc), Q.skip(0), Q.take(count.current))
|
||||
.observe();
|
||||
} else {
|
||||
const whereClause = [
|
||||
Q.where('rid', rid),
|
||||
Q.experimentalSortBy('ts', Q.desc),
|
||||
Q.experimentalSkip(0),
|
||||
Q.experimentalTake(count.current)
|
||||
] as (Q.WhereDescription | Q.Or)[];
|
||||
const whereClause = [Q.where('rid', rid), Q.sortBy('ts', Q.desc), Q.skip(0), Q.take(count.current)] as (
|
||||
| Q.WhereDescription
|
||||
| Q.Or
|
||||
)[];
|
||||
if (!showMessageInMainThread) {
|
||||
whereClause.push(Q.or(Q.where('tmid', null), Q.where('tshow', Q.eq(true))));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -537,9 +537,9 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
|
|||
const defaultWhereClause = [Q.where('archived', false), Q.where('open', true)] as (Q.WhereDescription | Q.SortBy)[];
|
||||
|
||||
if (sortBy === SortBy.Alphabetical) {
|
||||
defaultWhereClause.push(Q.experimentalSortBy(`${this.useRealName ? 'fname' : 'name'}`, Q.asc));
|
||||
defaultWhereClause.push(Q.sortBy(`${this.useRealName ? 'fname' : 'name'}`, Q.asc));
|
||||
} else {
|
||||
defaultWhereClause.push(Q.experimentalSortBy('room_updated_at', Q.desc));
|
||||
defaultWhereClause.push(Q.sortBy('room_updated_at', Q.desc));
|
||||
}
|
||||
|
||||
// When we're grouping by something
|
||||
|
|
@ -553,7 +553,7 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
|
|||
this.count += QUERY_SIZE;
|
||||
observable = await db
|
||||
.get('subscriptions')
|
||||
.query(...defaultWhereClause, Q.experimentalSkip(0), Q.experimentalTake(this.count))
|
||||
.query(...defaultWhereClause, Q.skip(0), Q.take(this.count))
|
||||
.observeWithColumns(['on_hold']);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -221,9 +221,9 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
|
|||
const defaultWhereClause = [
|
||||
Q.where('archived', false),
|
||||
Q.where('open', true),
|
||||
Q.experimentalSkip(0),
|
||||
Q.experimentalTake(20),
|
||||
Q.experimentalSortBy('room_updated_at', Q.desc)
|
||||
Q.skip(0),
|
||||
Q.take(20),
|
||||
Q.sortBy('room_updated_at', Q.desc)
|
||||
] as (Q.WhereDescription | Q.Skip | Q.Take | Q.SortBy | Q.Or)[];
|
||||
if (text) {
|
||||
const likeString = sanitizeLikeString(text);
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
|
|||
this.messagesSubscription.unsubscribe();
|
||||
}
|
||||
|
||||
const whereClause = [Q.where('rid', this.rid), Q.experimentalSortBy('tlm', Q.desc)];
|
||||
const whereClause = [Q.where('rid', this.rid), Q.sortBy('tlm', Q.desc)];
|
||||
|
||||
if (searchText?.trim()) {
|
||||
whereClause.push(Q.where('msg', Q.like(`%${sanitizeLikeString(searchText.trim())}%`)));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
module.exports = {
|
||||
presets: ['module:metro-react-native-babel-preset'],
|
||||
presets: ['module:@react-native/babel-preset'],
|
||||
plugins: [
|
||||
['@babel/plugin-proposal-decorators', { legacy: true }],
|
||||
'react-native-reanimated/plugin',
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
export NODE_BINARY=$(command -v node)
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
ruby ">= 2.6.10"
|
||||
|
||||
gem 'fastlane'
|
||||
gem "cocoapods"
|
||||
gem 'cocoapods', '>= 1.13', '< 1.15'
|
||||
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
|
||||
gem "cocoapods-patch"
|
||||
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
|
||||
eval_gemfile(plugins_path) if File.exist?(plugins_path)
|
||||
|
|
|
|||
|
|
@ -1,48 +1,50 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.6)
|
||||
CFPropertyList (3.0.7)
|
||||
base64
|
||||
nkf
|
||||
rexml
|
||||
activesupport (6.1.6)
|
||||
activesupport (7.0.8.1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.8.6)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
algoliasearch (1.27.5)
|
||||
httpclient (~> 2.8, >= 2.8.3)
|
||||
json (>= 1.5.1)
|
||||
artifactory (3.0.15)
|
||||
artifactory (3.0.17)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.3.0)
|
||||
aws-partitions (1.881.0)
|
||||
aws-sdk-core (3.190.3)
|
||||
aws-partitions (1.897.0)
|
||||
aws-sdk-core (3.191.3)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.8)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.76.0)
|
||||
aws-sdk-core (~> 3, >= 3.188.0)
|
||||
aws-sdk-kms (1.77.0)
|
||||
aws-sdk-core (~> 3, >= 3.191.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.142.0)
|
||||
aws-sdk-core (~> 3, >= 3.189.0)
|
||||
aws-sdk-s3 (1.144.0)
|
||||
aws-sdk-core (~> 3, >= 3.191.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.8)
|
||||
aws-sigv4 (1.8.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.2.0)
|
||||
claide (1.1.0)
|
||||
cocoapods (1.11.3)
|
||||
cocoapods (1.14.3)
|
||||
addressable (~> 2.8)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.11.3)
|
||||
cocoapods-core (= 1.14.3)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.4.0, < 2.0)
|
||||
cocoapods-downloader (>= 2.1, < 3.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.4.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.6.0, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
|
|
@ -50,10 +52,10 @@ GEM
|
|||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.8.0)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (>= 1.0, < 3.0)
|
||||
xcodeproj (>= 1.21.0, < 2.0)
|
||||
cocoapods-core (1.11.3)
|
||||
activesupport (>= 5.0, < 7)
|
||||
ruby-macho (>= 2.3.0, < 3.0)
|
||||
xcodeproj (>= 1.23.0, < 2.0)
|
||||
cocoapods-core (1.14.3)
|
||||
activesupport (>= 5.0, < 8)
|
||||
addressable (~> 2.8)
|
||||
algoliasearch (~> 1.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
|
|
@ -63,9 +65,9 @@ GEM
|
|||
public_suffix (~> 4.0)
|
||||
typhoeus (~> 1.0)
|
||||
cocoapods-deintegrate (1.0.5)
|
||||
cocoapods-downloader (1.6.3)
|
||||
cocoapods-patch (1.0.2)
|
||||
cocoapods (~> 1.11.0)
|
||||
cocoapods-downloader (2.1)
|
||||
cocoapods-patch (1.3.0)
|
||||
cocoapods (>= 1.12.0, < 2.0)
|
||||
cocoapods-plugins (1.0.0)
|
||||
nap
|
||||
cocoapods-search (1.0.1)
|
||||
|
|
@ -77,7 +79,7 @@ GEM
|
|||
colored2 (3.1.2)
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
concurrent-ruby (1.1.10)
|
||||
concurrent-ruby (1.2.3)
|
||||
declarative (0.0.20)
|
||||
digest-crc (0.6.5)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
|
|
@ -85,9 +87,9 @@ GEM
|
|||
dotenv (2.8.1)
|
||||
emoji_regex (3.2.3)
|
||||
escape (0.0.4)
|
||||
ethon (0.15.0)
|
||||
ethon (0.16.0)
|
||||
ffi (>= 1.15.0)
|
||||
excon (0.109.0)
|
||||
excon (0.110.0)
|
||||
faraday (1.10.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
|
|
@ -158,14 +160,15 @@ GEM
|
|||
xcodeproj (>= 1.13.0, < 2.0.0)
|
||||
xcpretty (~> 0.3.0)
|
||||
xcpretty-travis-formatter (>= 0.0.3)
|
||||
fastlane-plugin-bugsnag (2.2.1)
|
||||
fastlane-plugin-bugsnag (2.3.0)
|
||||
git
|
||||
xml-simple
|
||||
ffi (1.15.5)
|
||||
ffi (1.16.3)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
git (1.11.0)
|
||||
git (1.19.1)
|
||||
addressable (~> 2.8)
|
||||
rchardet (~> 1.8)
|
||||
google-apis-androidpublisher_v3 (0.54.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
|
|
@ -183,12 +186,12 @@ GEM
|
|||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-storage_v1 (0.31.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-cloud-core (1.6.1)
|
||||
google-cloud-core (1.7.0)
|
||||
google-cloud-env (>= 1.0, < 3.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.3.1)
|
||||
google-cloud-errors (1.4.0)
|
||||
google-cloud-storage (1.47.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
|
|
@ -207,21 +210,23 @@ GEM
|
|||
http-cookie (1.0.5)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.10.0)
|
||||
i18n (1.14.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jmespath (1.6.2)
|
||||
json (2.7.1)
|
||||
jwt (2.7.1)
|
||||
jwt (2.8.1)
|
||||
base64
|
||||
mini_magick (4.12.0)
|
||||
mini_mime (1.1.5)
|
||||
minitest (5.16.1)
|
||||
minitest (5.22.3)
|
||||
molinillo (0.8.0)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.3.0)
|
||||
multipart-post (2.4.0)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
naturally (2.2.1)
|
||||
netrc (0.11.0)
|
||||
nkf (0.2.0)
|
||||
optparse (0.4.0)
|
||||
os (1.1.4)
|
||||
plist (3.7.1)
|
||||
|
|
@ -239,7 +244,7 @@ GEM
|
|||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.3.2)
|
||||
security (0.1.3)
|
||||
signet (0.18.0)
|
||||
signet (0.19.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
|
|
@ -255,14 +260,14 @@ GEM
|
|||
tty-screen (0.8.2)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
typhoeus (1.4.0)
|
||||
typhoeus (1.4.1)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (2.0.4)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uber (0.1.0)
|
||||
unicode-display_width (2.5.0)
|
||||
word_wrap (1.0.0)
|
||||
xcodeproj (1.23.0)
|
||||
xcodeproj (1.24.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
|
|
@ -275,13 +280,13 @@ GEM
|
|||
xcpretty (~> 0.2, >= 0.0.7)
|
||||
xml-simple (1.1.9)
|
||||
rexml
|
||||
zeitwerk (2.6.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cocoapods
|
||||
activesupport (>= 6.1.7.5, < 7.1.0)
|
||||
cocoapods (>= 1.13, < 1.15)
|
||||
cocoapods-patch
|
||||
fastlane
|
||||
fastlane-plugin-bugsnag
|
||||
|
|
|
|||
45
ios/Podfile
45
ios/Podfile
|
|
@ -2,10 +2,34 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
|
|||
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
|
||||
require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
|
||||
|
||||
plugin 'cocoapods-patch'
|
||||
# Resolve react_native_pods.rb with node to allow for hoisting
|
||||
require Pod::Executable.execute_command('node', ['-p',
|
||||
'require.resolve(
|
||||
"react-native/scripts/react_native_pods.rb",
|
||||
{paths: [process.argv[1]]},
|
||||
)', __dir__]).strip
|
||||
|
||||
platform :ios, min_ios_version_supported
|
||||
prepare_react_native_project!
|
||||
|
||||
platform :ios, '12.0'
|
||||
install! 'cocoapods', :deterministic_uuids => false
|
||||
plugin 'cocoapods-patch'
|
||||
|
||||
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
|
||||
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
|
||||
#
|
||||
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
|
||||
# ```js
|
||||
# module.exports = {
|
||||
# dependencies: {
|
||||
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
|
||||
# ```
|
||||
# flipper_config = FlipperConfiguration.disabled # ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
|
||||
|
||||
linkage = ENV['USE_FRAMEWORKS']
|
||||
if linkage != nil
|
||||
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
|
||||
use_frameworks! :linkage => linkage.to_sym
|
||||
end
|
||||
|
||||
def all_pods
|
||||
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi', :modular_headers => true
|
||||
|
|
@ -26,13 +50,9 @@ def all_pods
|
|||
|
||||
use_react_native!(
|
||||
:path => config[:reactNativePath],
|
||||
:hermes_enabled => true, # flags[:hermes_enabled],
|
||||
:fabric_enabled => flags[:fabric_enabled],
|
||||
# :flipper_configuration => false, # flipper_config,
|
||||
:app_path => "#{Pod::Config.instance.installation_root}/.."
|
||||
)
|
||||
|
||||
# Enable and run pods again, if you want to use Flipper
|
||||
# use_flipper!()
|
||||
end
|
||||
|
||||
abstract_target 'defaults' do
|
||||
|
|
@ -46,7 +66,12 @@ abstract_target 'defaults' do
|
|||
end
|
||||
|
||||
post_install do |installer|
|
||||
react_native_post_install(installer)
|
||||
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
|
||||
react_native_post_install(
|
||||
installer,
|
||||
# config[:reactNativePath],
|
||||
# :mac_catalyst_enabled => false
|
||||
)
|
||||
|
||||
installer.pods_project.targets.each do |target|
|
||||
target.build_configurations.each do |config|
|
||||
|
|
@ -56,7 +81,7 @@ post_install do |installer|
|
|||
config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
|
||||
case target.name
|
||||
when 'RCT-Folly'
|
||||
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
|
||||
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
|
||||
else
|
||||
config.build_settings.delete('IPHONEOS_DEPLOYMENT_TARGET')
|
||||
end
|
||||
|
|
|
|||
1650
ios/Podfile.lock
1650
ios/Podfile.lock
File diff suppressed because it is too large
Load Diff
|
|
@ -10,6 +10,7 @@
|
|||
0C6E2DE448364EA896869ADF /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B37C79D9BD0742CE936B6982 /* libc++.tbd */; };
|
||||
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
|
||||
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
|
||||
13D7F2A585696E2BF6A8C18A /* libPods-defaults-Rocket.Chat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFD83A4683FA209D70877FB4 /* libPods-defaults-Rocket.Chat.a */; };
|
||||
1E01C81C2511208400FEF824 /* URL+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E01C81B2511208400FEF824 /* URL+Extensions.swift */; };
|
||||
1E01C8212511301400FEF824 /* PushResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E01C8202511301400FEF824 /* PushResponse.swift */; };
|
||||
1E01C8252511303100FEF824 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E01C8242511303100FEF824 /* Notification.swift */; };
|
||||
|
|
@ -79,10 +80,12 @@
|
|||
1EFEB5982493B6640072EDC0 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EFEB5972493B6640072EDC0 /* NotificationService.swift */; };
|
||||
1EFEB59C2493B6640072EDC0 /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 1EFEB5952493B6640072EDC0 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
24A2AEF2383D44B586D31C01 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 06BB44DD4855498082A744AD /* libz.tbd */; };
|
||||
40F02A25DF4A436C69D57156 /* libPods-defaults-RocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CC656AF598B9611936E5F1BD /* libPods-defaults-RocketChatRN.a */; };
|
||||
4C4C8603EF082F0A33A95522 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D5C142B655F8EFD006792C /* ExpoModulesProvider.swift */; };
|
||||
5566971254665D9808DA5C5B /* libPods-defaults-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DB6E3CBBA097F025BDC054D /* libPods-defaults-NotificationService.a */; };
|
||||
5C4C336B6BD55B2921C549F8 /* libPods-defaults-ShareRocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63DD6182EE980DD7D01E397E /* libPods-defaults-ShareRocketChatRN.a */; };
|
||||
65B9A71A2AFC24190088956F /* ringtone.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 65B9A7192AFC24190088956F /* ringtone.mp3 */; };
|
||||
65B9A71B2AFC24190088956F /* ringtone.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 65B9A7192AFC24190088956F /* ringtone.mp3 */; };
|
||||
6CB49211C7A47BADDAF1C05D /* libPods-defaults-RocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB1B2C4312A1CED94DD1008 /* libPods-defaults-RocketChatRN.a */; };
|
||||
7A006F14229C83B600803143 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7A006F13229C83B600803143 /* GoogleService-Info.plist */; };
|
||||
7A0D62D2242AB187006D5C06 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */; };
|
||||
7A14FCED257FEB3A005BDCD4 /* Experimental.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A14FCEC257FEB3A005BDCD4 /* Experimental.xcassets */; };
|
||||
|
|
@ -143,10 +146,7 @@
|
|||
7AE10C0728A59530003593CB /* Inter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7AE10C0528A59530003593CB /* Inter.ttf */; };
|
||||
7AE10C0828A59530003593CB /* Inter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7AE10C0528A59530003593CB /* Inter.ttf */; };
|
||||
85160EB6C143E0493FE5F014 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194D9A8897F4A486C2C6F89A /* ExpoModulesProvider.swift */; };
|
||||
8B6F27FA685A3D34DF28B4E0 /* libPods-defaults-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39104844B257F72E9D047315 /* libPods-defaults-NotificationService.a */; };
|
||||
B9703971171B2D3EB0723C05 /* libPods-defaults-Rocket.Chat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D458BEE2281407F404CDB33F /* libPods-defaults-Rocket.Chat.a */; };
|
||||
BC404914E86821389EEB543D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 391C4F7AA7023CD41EEBD106 /* ExpoModulesProvider.swift */; };
|
||||
D778529F5C5E0689FB2C863A /* libPods-defaults-ShareRocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F7E7AAF900DB63FA0643F09 /* libPods-defaults-ShareRocketChatRN.a */; };
|
||||
D94D81FB9E10756FAA03F203 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 016747EF3B9FED8DE2C9DA14 /* ExpoModulesProvider.swift */; };
|
||||
DD2BA30A89E64F189C2C24AC /* libWatermelonDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BA7E862283664608B3894E34 /* libWatermelonDB.a */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
|
@ -213,12 +213,14 @@
|
|||
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
|
||||
016747EF3B9FED8DE2C9DA14 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-ShareRocketChatRN/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
|
||||
06BB44DD4855498082A744AD /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
|
||||
06C10FF88064935A9AE87589 /* Pods-defaults-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
13B07F961A680F5B00A75B9A /* Rocket.Chat Experimental.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Rocket.Chat Experimental.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RocketChatRN/AppDelegate.h; sourceTree = "<group>"; };
|
||||
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RocketChatRN/Images.xcassets; sourceTree = "<group>"; };
|
||||
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RocketChatRN/Info.plist; sourceTree = "<group>"; };
|
||||
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RocketChatRN/main.m; sourceTree = "<group>"; };
|
||||
194D9A8897F4A486C2C6F89A /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-NotificationService/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
|
||||
1C1F6E46D7CB8EB40B7BE061 /* Pods-defaults-Rocket.Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.release.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.release.xcconfig"; sourceTree = "<group>"; };
|
||||
1E01C81B2511208400FEF824 /* URL+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Extensions.swift"; sourceTree = "<group>"; };
|
||||
1E01C8202511301400FEF824 /* PushResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushResponse.swift; sourceTree = "<group>"; };
|
||||
1E01C8242511303100FEF824 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -265,16 +267,13 @@
|
|||
1EFEB5972493B6640072EDC0 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
|
||||
1EFEB5992493B6640072EDC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
1EFEB5A12493B67D0072EDC0 /* NotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NotificationService.entitlements; sourceTree = "<group>"; };
|
||||
290CF216098C341E0A62160E /* Pods-defaults-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
|
||||
39104844B257F72E9D047315 /* libPods-defaults-NotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-NotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
391C4F7AA7023CD41EEBD106 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-Rocket.Chat/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
|
||||
4405BF4544FA5FCD047DE016 /* Pods-defaults-Rocket.Chat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.debug.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
45D5C142B655F8EFD006792C /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-RocketChatRN/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
|
||||
4E882A2AC13FD3C073128EF6 /* Pods-defaults-Rocket.Chat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.debug.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
5B8F57A5EB0BBDB9A402C25F /* Pods-defaults-ShareRocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-ShareRocketChatRN.release.xcconfig"; path = "Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
|
||||
5F43124ACB5EC56A936B2725 /* Pods-defaults-ShareRocketChatRN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-ShareRocketChatRN.debug.xcconfig"; path = "Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
60B2A6A31FC4588700BD58E5 /* RocketChatRN.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RocketChatRN.entitlements; path = RocketChatRN/RocketChatRN.entitlements; sourceTree = "<group>"; };
|
||||
63DD6182EE980DD7D01E397E /* libPods-defaults-ShareRocketChatRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-ShareRocketChatRN.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
65B9A7192AFC24190088956F /* ringtone.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = ringtone.mp3; sourceTree = "<group>"; };
|
||||
6F7E7AAF900DB63FA0643F09 /* libPods-defaults-ShareRocketChatRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-ShareRocketChatRN.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
765EBBD79368D0FA73D3E868 /* Pods-defaults-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
|
||||
7A006F13229C83B600803143 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
|
||||
7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
7A14FCEC257FEB3A005BDCD4 /* Experimental.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Experimental.xcassets; sourceTree = "<group>"; };
|
||||
|
|
@ -285,14 +284,15 @@
|
|||
7AAB3E52257E6A6E00707CF6 /* Rocket.Chat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Rocket.Chat.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
7ACD4853222860DE00442C55 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
|
||||
7AE10C0528A59530003593CB /* Inter.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Inter.ttf; sourceTree = "<group>"; };
|
||||
804D92F23707360DE686C586 /* Pods-defaults-RocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.release.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
|
||||
8D9DA7CD79909E251F469FD5 /* Pods-defaults-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
9449FA42E7E0B86667975BBB /* Pods-defaults-RocketChatRN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.debug.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
A7E33F4FD705C0E2C4F9A7AA /* Pods-defaults-Rocket.Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.release.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.release.xcconfig"; sourceTree = "<group>"; };
|
||||
7E3138BF90E7253FC7F356A9 /* Pods-defaults-ShareRocketChatRN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-ShareRocketChatRN.debug.xcconfig"; path = "Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
8DB6E3CBBA097F025BDC054D /* libPods-defaults-NotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-NotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
AB1B308340BF20B077BBDC5B /* Pods-defaults-RocketChatRN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.debug.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
B37C79D9BD0742CE936B6982 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
|
||||
B92359BC037CA5B5C1BD0C76 /* Pods-defaults-ShareRocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-ShareRocketChatRN.release.xcconfig"; path = "Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
|
||||
BA7E862283664608B3894E34 /* libWatermelonDB.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libWatermelonDB.a; sourceTree = "<group>"; };
|
||||
CC656AF598B9611936E5F1BD /* libPods-defaults-RocketChatRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-RocketChatRN.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
D458BEE2281407F404CDB33F /* libPods-defaults-Rocket.Chat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-Rocket.Chat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
BBB1B2C4312A1CED94DD1008 /* libPods-defaults-RocketChatRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-RocketChatRN.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
BFD83A4683FA209D70877FB4 /* libPods-defaults-Rocket.Chat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-Rocket.Chat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
C28FDE9ABEC942297CB875F5 /* Pods-defaults-RocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.release.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
|
|
@ -313,7 +313,7 @@
|
|||
7ACD4897222860DE00442C55 /* JavaScriptCore.framework in Frameworks */,
|
||||
24A2AEF2383D44B586D31C01 /* libz.tbd in Frameworks */,
|
||||
DD2BA30A89E64F189C2C24AC /* libWatermelonDB.a in Frameworks */,
|
||||
40F02A25DF4A436C69D57156 /* libPods-defaults-RocketChatRN.a in Frameworks */,
|
||||
6CB49211C7A47BADDAF1C05D /* libPods-defaults-RocketChatRN.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -322,7 +322,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1E25743422CBA2CF005A877F /* JavaScriptCore.framework in Frameworks */,
|
||||
D778529F5C5E0689FB2C863A /* libPods-defaults-ShareRocketChatRN.a in Frameworks */,
|
||||
5C4C336B6BD55B2921C549F8 /* libPods-defaults-ShareRocketChatRN.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -330,7 +330,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
8B6F27FA685A3D34DF28B4E0 /* libPods-defaults-NotificationService.a in Frameworks */,
|
||||
5566971254665D9808DA5C5B /* libPods-defaults-NotificationService.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -351,7 +351,7 @@
|
|||
7AAB3E3D257E6A6E00707CF6 /* JavaScriptCore.framework in Frameworks */,
|
||||
7AAB3E3E257E6A6E00707CF6 /* libz.tbd in Frameworks */,
|
||||
7AAB3E3F257E6A6E00707CF6 /* libWatermelonDB.a in Frameworks */,
|
||||
B9703971171B2D3EB0723C05 /* libPods-defaults-Rocket.Chat.a in Frameworks */,
|
||||
13D7F2A585696E2BF6A8C18A /* libPods-defaults-Rocket.Chat.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -503,14 +503,14 @@
|
|||
7AC2B09613AA7C3FEBAC9F57 /* Pods */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
8D9DA7CD79909E251F469FD5 /* Pods-defaults-NotificationService.debug.xcconfig */,
|
||||
290CF216098C341E0A62160E /* Pods-defaults-NotificationService.release.xcconfig */,
|
||||
4E882A2AC13FD3C073128EF6 /* Pods-defaults-Rocket.Chat.debug.xcconfig */,
|
||||
A7E33F4FD705C0E2C4F9A7AA /* Pods-defaults-Rocket.Chat.release.xcconfig */,
|
||||
9449FA42E7E0B86667975BBB /* Pods-defaults-RocketChatRN.debug.xcconfig */,
|
||||
804D92F23707360DE686C586 /* Pods-defaults-RocketChatRN.release.xcconfig */,
|
||||
5F43124ACB5EC56A936B2725 /* Pods-defaults-ShareRocketChatRN.debug.xcconfig */,
|
||||
5B8F57A5EB0BBDB9A402C25F /* Pods-defaults-ShareRocketChatRN.release.xcconfig */,
|
||||
06C10FF88064935A9AE87589 /* Pods-defaults-NotificationService.debug.xcconfig */,
|
||||
765EBBD79368D0FA73D3E868 /* Pods-defaults-NotificationService.release.xcconfig */,
|
||||
4405BF4544FA5FCD047DE016 /* Pods-defaults-Rocket.Chat.debug.xcconfig */,
|
||||
1C1F6E46D7CB8EB40B7BE061 /* Pods-defaults-Rocket.Chat.release.xcconfig */,
|
||||
AB1B308340BF20B077BBDC5B /* Pods-defaults-RocketChatRN.debug.xcconfig */,
|
||||
C28FDE9ABEC942297CB875F5 /* Pods-defaults-RocketChatRN.release.xcconfig */,
|
||||
7E3138BF90E7253FC7F356A9 /* Pods-defaults-ShareRocketChatRN.debug.xcconfig */,
|
||||
B92359BC037CA5B5C1BD0C76 /* Pods-defaults-ShareRocketChatRN.release.xcconfig */,
|
||||
);
|
||||
path = Pods;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -601,10 +601,10 @@
|
|||
7ACD4853222860DE00442C55 /* JavaScriptCore.framework */,
|
||||
B37C79D9BD0742CE936B6982 /* libc++.tbd */,
|
||||
06BB44DD4855498082A744AD /* libz.tbd */,
|
||||
39104844B257F72E9D047315 /* libPods-defaults-NotificationService.a */,
|
||||
D458BEE2281407F404CDB33F /* libPods-defaults-Rocket.Chat.a */,
|
||||
CC656AF598B9611936E5F1BD /* libPods-defaults-RocketChatRN.a */,
|
||||
6F7E7AAF900DB63FA0643F09 /* libPods-defaults-ShareRocketChatRN.a */,
|
||||
8DB6E3CBBA097F025BDC054D /* libPods-defaults-NotificationService.a */,
|
||||
BFD83A4683FA209D70877FB4 /* libPods-defaults-Rocket.Chat.a */,
|
||||
BBB1B2C4312A1CED94DD1008 /* libPods-defaults-RocketChatRN.a */,
|
||||
63DD6182EE980DD7D01E397E /* libPods-defaults-ShareRocketChatRN.a */,
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -624,7 +624,7 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "RocketChatRN" */;
|
||||
buildPhases = (
|
||||
37AEC2B2D006EB65E9E8F12F /* [CP] Check Pods Manifest.lock */,
|
||||
15F53B1FA45354B3E02158B1 /* [CP] Check Pods Manifest.lock */,
|
||||
7AA5C63E23E30D110005C4A7 /* Start Packager */,
|
||||
13B07F871A680F5B00A75B9A /* Sources */,
|
||||
13B07F8C1A680F5B00A75B9A /* Frameworks */,
|
||||
|
|
@ -633,8 +633,8 @@
|
|||
1EC6ACF422CB9FC300A41C61 /* Embed App Extensions */,
|
||||
1E1EA8082326CCE300E22452 /* ShellScript */,
|
||||
7AAE9EB32891A0D20024F559 /* Upload source maps to Bugsnag */,
|
||||
7F13D807CA5B7E43CE899DB3 /* [CP] Embed Pods Frameworks */,
|
||||
A1315A8FDA7B970DFBDB34C7 /* [CP] Copy Pods Resources */,
|
||||
0FED93F9EB690A6575B5190F /* [CP] Embed Pods Frameworks */,
|
||||
F060B9B3399B21782F986FA8 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -651,12 +651,12 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 1EC6ACF322CB9FC300A41C61 /* Build configuration list for PBXNativeTarget "ShareRocketChatRN" */;
|
||||
buildPhases = (
|
||||
0558891725AA0CE58E4BB3D1 /* [CP] Check Pods Manifest.lock */,
|
||||
DC656E2BEC764ACC48245854 /* [CP] Check Pods Manifest.lock */,
|
||||
1EC6ACAC22CB9FC300A41C61 /* Sources */,
|
||||
1EC6ACAD22CB9FC300A41C61 /* Frameworks */,
|
||||
1EC6ACAE22CB9FC300A41C61 /* Resources */,
|
||||
1EFE4DC322CBF36300B766B7 /* ShellScript */,
|
||||
0A42F15A45D1EDC5325BBDAA /* [CP] Copy Pods Resources */,
|
||||
E2D3832380EB932D2B269C52 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -671,11 +671,11 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 1EFEB5A02493B6640072EDC0 /* Build configuration list for PBXNativeTarget "NotificationService" */;
|
||||
buildPhases = (
|
||||
C39B55AE7DC2B0A40EC7DF58 /* [CP] Check Pods Manifest.lock */,
|
||||
05869165655D8F788C3ABAEE /* [CP] Check Pods Manifest.lock */,
|
||||
1EFEB5912493B6640072EDC0 /* Sources */,
|
||||
1EFEB5922493B6640072EDC0 /* Frameworks */,
|
||||
1EFEB5932493B6640072EDC0 /* Resources */,
|
||||
BE2180B86A119238B820122A /* [CP] Copy Pods Resources */,
|
||||
D9F98166F1B17E742A6A17DE /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -690,7 +690,7 @@
|
|||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 7AAB3E4F257E6A6E00707CF6 /* Build configuration list for PBXNativeTarget "Rocket.Chat" */;
|
||||
buildPhases = (
|
||||
1FC466D7FEE886FBDB6F9951 /* [CP] Check Pods Manifest.lock */,
|
||||
1AEDDF4B6D058A7D341DDDA6 /* [CP] Check Pods Manifest.lock */,
|
||||
7AAB3E13257E6A6E00707CF6 /* Start Packager */,
|
||||
7AAB3E14257E6A6E00707CF6 /* Sources */,
|
||||
7AAB3E32257E6A6E00707CF6 /* Frameworks */,
|
||||
|
|
@ -699,8 +699,8 @@
|
|||
7AAB3E48257E6A6E00707CF6 /* Embed App Extensions */,
|
||||
7AAB3E4B257E6A6E00707CF6 /* ShellScript */,
|
||||
7A10288726B1D15200E47EF8 /* Upload source maps to Bugsnag */,
|
||||
4CC99291A49CC4B7F5883239 /* [CP] Embed Pods Frameworks */,
|
||||
B237EE54305A08A30FCABFA0 /* [CP] Copy Pods Resources */,
|
||||
7342EC362D65CD750D5EC8FF /* [CP] Embed Pods Frameworks */,
|
||||
CC88DE60C2727B808F737771 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
|
|
@ -852,7 +852,7 @@
|
|||
shellPath = /bin/sh;
|
||||
shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
|
||||
};
|
||||
0558891725AA0CE58E4BB3D1 /* [CP] Check Pods Manifest.lock */ = {
|
||||
05869165655D8F788C3ABAEE /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
|
|
@ -867,67 +867,75 @@
|
|||
outputFileListPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-ShareRocketChatRN-checkManifestLockResult.txt",
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-NotificationService-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;
|
||||
};
|
||||
0A42F15A45D1EDC5325BBDAA /* [CP] Copy Pods Resources */ = {
|
||||
0FED93F9EB690A6575B5190F /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN-resources.sh",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle",
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh",
|
||||
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
|
||||
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN-resources.sh\"\n";
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
15F53B1FA45354B3E02158B1 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
||||
"${PODS_ROOT}/Manifest.lock",
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputFileListPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-RocketChatRN-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;
|
||||
};
|
||||
1AEDDF4B6D058A7D341DDDA6 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
||||
"${PODS_ROOT}/Manifest.lock",
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputFileListPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-Rocket.Chat-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;
|
||||
};
|
||||
1E1EA8082326CCE300E22452 /* ShellScript */ = {
|
||||
|
|
@ -964,51 +972,7 @@
|
|||
shellPath = /bin/sh;
|
||||
shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
|
||||
};
|
||||
1FC466D7FEE886FBDB6F9951 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
||||
"${PODS_ROOT}/Manifest.lock",
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputFileListPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-Rocket.Chat-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;
|
||||
};
|
||||
37AEC2B2D006EB65E9E8F12F /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputFileListPaths = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
||||
"${PODS_ROOT}/Manifest.lock",
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputFileListPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-RocketChatRN-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;
|
||||
};
|
||||
4CC99291A49CC4B7F5883239 /* [CP] Embed Pods Frameworks */ = {
|
||||
7342EC362D65CD750D5EC8FF /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
|
|
@ -1016,7 +980,7 @@
|
|||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-frameworks.sh",
|
||||
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
|
||||
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
|
||||
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
|
|
@ -1131,89 +1095,16 @@
|
|||
shellPath = /bin/sh;
|
||||
shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n";
|
||||
};
|
||||
7F13D807CA5B7E43CE899DB3 /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh",
|
||||
"${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}/OpenSSL.framework",
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
A1315A8FDA7B970DFBDB34C7 /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle",
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
B237EE54305A08A30FCABFA0 /* [CP] Copy Pods Resources */ = {
|
||||
CC88DE60C2727B808F737771 /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-resources.sh",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
|
||||
|
|
@ -1231,12 +1122,14 @@
|
|||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle",
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
|
||||
|
|
@ -1254,22 +1147,24 @@
|
|||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
BE2180B86A119238B820122A /* [CP] Copy Pods Resources */ = {
|
||||
D9F98166F1B17E742A6A17DE /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService-resources.sh",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
|
||||
|
|
@ -1287,12 +1182,14 @@
|
|||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle",
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
|
||||
|
|
@ -1310,16 +1207,15 @@
|
|||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
C39B55AE7DC2B0A40EC7DF58 /* [CP] Check Pods Manifest.lock */ = {
|
||||
DC656E2BEC764ACC48245854 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
|
|
@ -1334,13 +1230,133 @@
|
|||
outputFileListPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-NotificationService-checkManifestLockResult.txt",
|
||||
"$(DERIVED_FILE_DIR)/Pods-defaults-ShareRocketChatRN-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;
|
||||
};
|
||||
E2D3832380EB932D2B269C52 /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN-resources.sh",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-ShareRocketChatRN/Pods-defaults-ShareRocketChatRN-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
F060B9B3399B21782F986FA8 /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
|
||||
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
|
||||
"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
|
||||
);
|
||||
name = "[CP] Copy Pods Resources";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
|
||||
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
|
|
@ -1498,7 +1514,7 @@
|
|||
/* Begin XCBuildConfiguration section */
|
||||
13B07F941A680F5B00A75B9A /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 9449FA42E7E0B86667975BBB /* Pods-defaults-RocketChatRN.debug.xcconfig */;
|
||||
baseConfigurationReference = AB1B308340BF20B077BBDC5B /* Pods-defaults-RocketChatRN.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
||||
APPLICATION_EXTENSION_API_ONLY = NO;
|
||||
|
|
@ -1524,7 +1540,7 @@
|
|||
"$(SRCROOT)/../node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/**",
|
||||
);
|
||||
INFOPLIST_FILE = RocketChatRN/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
|
|
@ -1554,7 +1570,7 @@
|
|||
};
|
||||
13B07F951A680F5B00A75B9A /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 804D92F23707360DE686C586 /* Pods-defaults-RocketChatRN.release.xcconfig */;
|
||||
baseConfigurationReference = C28FDE9ABEC942297CB875F5 /* Pods-defaults-RocketChatRN.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
||||
APPLICATION_EXTENSION_API_ONLY = NO;
|
||||
|
|
@ -1580,7 +1596,7 @@
|
|||
"$(SRCROOT)/../node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/**",
|
||||
);
|
||||
INFOPLIST_FILE = RocketChatRN/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
|
|
@ -1610,7 +1626,7 @@
|
|||
};
|
||||
1EC6ACBC22CB9FC300A41C61 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 5F43124ACB5EC56A936B2725 /* Pods-defaults-ShareRocketChatRN.debug.xcconfig */;
|
||||
baseConfigurationReference = 7E3138BF90E7253FC7F356A9 /* Pods-defaults-ShareRocketChatRN.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
|
||||
APPLICATION_EXTENSION_API_ONLY = YES;
|
||||
|
|
@ -1652,12 +1668,13 @@
|
|||
"$(inherited)",
|
||||
"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
|
||||
"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
|
||||
$PODS_CONFIGURATION_BUILD_DIR/Firebase,
|
||||
);
|
||||
INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/usr/lib/swift",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
"$(inherited)",
|
||||
);
|
||||
|
|
@ -1678,7 +1695,7 @@
|
|||
};
|
||||
1EC6ACBD22CB9FC300A41C61 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 5B8F57A5EB0BBDB9A402C25F /* Pods-defaults-ShareRocketChatRN.release.xcconfig */;
|
||||
baseConfigurationReference = B92359BC037CA5B5C1BD0C76 /* Pods-defaults-ShareRocketChatRN.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
|
||||
APPLICATION_EXTENSION_API_ONLY = YES;
|
||||
|
|
@ -1720,12 +1737,13 @@
|
|||
"$(inherited)",
|
||||
"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
|
||||
"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
|
||||
$PODS_CONFIGURATION_BUILD_DIR/Firebase,
|
||||
);
|
||||
INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/usr/lib/swift",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
"$(inherited)",
|
||||
);
|
||||
|
|
@ -1746,7 +1764,7 @@
|
|||
};
|
||||
1EFEB59D2493B6640072EDC0 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8D9DA7CD79909E251F469FD5 /* Pods-defaults-NotificationService.debug.xcconfig */;
|
||||
baseConfigurationReference = 06C10FF88064935A9AE87589 /* Pods-defaults-NotificationService.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
|
|
@ -1764,7 +1782,7 @@
|
|||
EXCLUDED_ARCHS = "";
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
INFOPLIST_FILE = NotificationService/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
MARKETING_VERSION = 4.48.0;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
|
|
@ -1783,7 +1801,7 @@
|
|||
};
|
||||
1EFEB59E2493B6640072EDC0 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 290CF216098C341E0A62160E /* Pods-defaults-NotificationService.release.xcconfig */;
|
||||
baseConfigurationReference = 765EBBD79368D0FA73D3E868 /* Pods-defaults-NotificationService.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
|
|
@ -1803,7 +1821,7 @@
|
|||
EXCLUDED_ARCHS = "";
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
INFOPLIST_FILE = NotificationService/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
MARKETING_VERSION = 4.48.0;
|
||||
MTL_FAST_MATH = YES;
|
||||
|
|
@ -1821,7 +1839,7 @@
|
|||
};
|
||||
7AAB3E50257E6A6E00707CF6 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 4E882A2AC13FD3C073128EF6 /* Pods-defaults-Rocket.Chat.debug.xcconfig */;
|
||||
baseConfigurationReference = 4405BF4544FA5FCD047DE016 /* Pods-defaults-Rocket.Chat.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
||||
APPLICATION_EXTENSION_API_ONLY = NO;
|
||||
|
|
@ -1845,9 +1863,10 @@
|
|||
"$(SRCROOT)/../node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/**",
|
||||
);
|
||||
INFOPLIST_FILE = RocketChatRN/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/usr/lib/swift",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
"$(inherited)",
|
||||
);
|
||||
|
|
@ -1875,7 +1894,7 @@
|
|||
};
|
||||
7AAB3E51257E6A6E00707CF6 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = A7E33F4FD705C0E2C4F9A7AA /* Pods-defaults-Rocket.Chat.release.xcconfig */;
|
||||
baseConfigurationReference = 1C1F6E46D7CB8EB40B7BE061 /* Pods-defaults-Rocket.Chat.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
||||
APPLICATION_EXTENSION_API_ONLY = NO;
|
||||
|
|
@ -1899,9 +1918,10 @@
|
|||
"$(SRCROOT)/../node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/**",
|
||||
);
|
||||
INFOPLIST_FILE = RocketChatRN/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/usr/lib/swift",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
"$(inherited)",
|
||||
);
|
||||
|
|
@ -1931,7 +1951,7 @@
|
|||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
|
|
@ -1977,7 +1997,12 @@
|
|||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_CFLAGS = "$(inherited)";
|
||||
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
|
||||
OTHER_LDFLAGS = "$(inherited) ";
|
||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||
SDKROOT = iphoneos;
|
||||
USE_HERMES = true;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
|
@ -1986,7 +2011,7 @@
|
|||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
|
|
@ -2024,8 +2049,13 @@
|
|||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
OTHER_CFLAGS = "$(inherited)";
|
||||
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
|
||||
OTHER_LDFLAGS = "$(inherited) ";
|
||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||
SDKROOT = iphoneos;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
USE_HERMES = true;
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
name = Release;
|
||||
|
|
|
|||
|
|
@ -8,14 +8,12 @@
|
|||
*/
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
#import <React/RCTBridgeDelegate.h>
|
||||
#import <RCTAppDelegate.h>
|
||||
#import <Expo/Expo.h>
|
||||
// https://github.com/expo/expo/issues/17705#issuecomment-1196251146
|
||||
#import "ExpoModulesCore-Swift.h"
|
||||
#import "RocketChatRN-Swift.h"
|
||||
|
||||
@interface AppDelegate : EXAppDelegateWrapper <UIApplicationDelegate, RCTBridgeDelegate>
|
||||
|
||||
@property (nonatomic, strong) UIWindow *window;
|
||||
@interface AppDelegate : EXAppDelegateWrapper
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
#import "AppDelegate.h"
|
||||
#import <React/RCTBridge.h>
|
||||
#import <React/RCTBundleURLProvider.h>
|
||||
#import <React/RCTRootView.h>
|
||||
#import <React/RCTLinkingManager.h>
|
||||
#import "RNNotifications.h"
|
||||
#import "RNBootSplash.h"
|
||||
|
|
@ -10,70 +8,39 @@
|
|||
#import <Bugsnag/Bugsnag.h>
|
||||
#import <MMKV/MMKV.h>
|
||||
|
||||
#import <React/RCTAppSetupUtils.h>
|
||||
#if RCT_NEW_ARCH_ENABLED
|
||||
#import <React/CoreModulesPlugins.h>
|
||||
#import <React/RCTCxxBridgeDelegate.h>
|
||||
#import <React/RCTFabricSurfaceHostingProxyRootView.h>
|
||||
#import <React/RCTSurfacePresenter.h>
|
||||
#import <React/RCTSurfacePresenterBridgeAdapter.h>
|
||||
#import <ReactCommon/RCTTurboModuleManager.h>
|
||||
#import <react/config/ReactNativeConfig.h>
|
||||
@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
|
||||
RCTTurboModuleManager *_turboModuleManager;
|
||||
RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
|
||||
std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
|
||||
facebook::react::ContextContainer::Shared _contextContainer;
|
||||
}
|
||||
@end
|
||||
#endif
|
||||
|
||||
@implementation AppDelegate
|
||||
|
||||
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
|
||||
{
|
||||
RCTAppSetupPrepareApp(application);
|
||||
RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
|
||||
#if RCT_NEW_ARCH_ENABLED
|
||||
_contextContainer = std::make_shared<facebook::react::ContextContainer const>();
|
||||
_reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
|
||||
_contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
|
||||
_bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
|
||||
bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
|
||||
#endif
|
||||
if(![FIRApp defaultApp]){
|
||||
[FIRApp configure];
|
||||
}
|
||||
[Bugsnag start];
|
||||
|
||||
UIView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"RocketChatRN" initialProperties:nil];
|
||||
|
||||
if (@available(iOS 13.0, *)) {
|
||||
rootView.backgroundColor = [UIColor systemBackgroundColor];
|
||||
} else {
|
||||
rootView.backgroundColor = [UIColor whiteColor];
|
||||
}
|
||||
|
||||
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
|
||||
UIViewController *rootViewController = [UIViewController new];
|
||||
UINavigationController *navigationController = [[UINavigationController alloc]initWithRootViewController:rootViewController];
|
||||
navigationController.navigationBarHidden = YES;
|
||||
rootViewController.view = rootView;
|
||||
self.window.rootViewController = navigationController;
|
||||
[self.window makeKeyAndVisible];
|
||||
[RNNotifications startMonitorNotifications];
|
||||
[ReplyNotification configure];
|
||||
|
||||
|
||||
// AppGroup MMKV
|
||||
NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"AppGroup"]].path;
|
||||
[MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo];
|
||||
|
||||
[RNNotifications startMonitorNotifications];
|
||||
[ReplyNotification configure];
|
||||
|
||||
[RNBootSplash initWithStoryboard:@"LaunchScreen" rootView:rootView];
|
||||
|
||||
self.moduleName = @"RocketChatRN";
|
||||
// You can add your custom initial props in the dictionary below.
|
||||
// They will be passed down to the ViewController used by React Native.
|
||||
self.initialProps = @{};
|
||||
[super application:application didFinishLaunchingWithOptions:launchOptions];
|
||||
|
||||
[RNBootSplash initWithStoryboard:@"LaunchScreen" rootView:self.window.rootViewController.view];
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
|
||||
{
|
||||
return [self getBundleURL];
|
||||
}
|
||||
|
||||
- (NSURL *)getBundleURL
|
||||
{
|
||||
#if DEBUG
|
||||
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
|
||||
|
|
@ -82,37 +49,6 @@
|
|||
#endif
|
||||
}
|
||||
|
||||
#if RCT_NEW_ARCH_ENABLED
|
||||
#pragma mark - RCTCxxBridgeDelegate
|
||||
- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
|
||||
{
|
||||
_turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
|
||||
delegate:self
|
||||
jsInvoker:bridge.jsCallInvoker];
|
||||
return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
|
||||
}
|
||||
#pragma mark RCTTurboModuleManagerDelegate
|
||||
- (Class)getModuleClassFromName:(const char *)name
|
||||
{
|
||||
return RCTCoreModulesClassProvider(name);
|
||||
}
|
||||
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
|
||||
jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
|
||||
initParams:
|
||||
(const facebook::react::ObjCTurboModule::InitParams &)params
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
|
||||
{
|
||||
return RCTAppSetupDefaultModuleFromClass(moduleClass);
|
||||
}
|
||||
#endif
|
||||
|
||||
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
|
||||
{
|
||||
[RNNotifications didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
|
||||
|
|
@ -122,17 +58,21 @@
|
|||
[RNNotifications didFailToRegisterForRemoteNotificationsWithError:error];
|
||||
}
|
||||
|
||||
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {
|
||||
[RNNotifications didReceiveBackgroundNotification:userInfo withCompletionHandler:completionHandler];
|
||||
}
|
||||
|
||||
- (BOOL)application:(UIApplication *)application
|
||||
openURL:(NSURL *)url
|
||||
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
|
||||
openURL:(NSURL *)url
|
||||
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
|
||||
{
|
||||
return [RCTLinkingManager application:application openURL:url options:options];
|
||||
}
|
||||
|
||||
- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity
|
||||
restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler
|
||||
restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler
|
||||
{
|
||||
return [RCTLinkingManager application:application
|
||||
return [RCTLinkingManager application:application
|
||||
continueUserActivity:userActivity
|
||||
restorationHandler:restorationHandler];
|
||||
}
|
||||
|
|
@ -141,4 +81,4 @@
|
|||
{
|
||||
return [Orientation getOrientation];
|
||||
}
|
||||
@end
|
||||
@end
|
||||
|
|
@ -58,17 +58,13 @@
|
|||
</array>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
<dict>
|
||||
<key>NSExceptionDomains</key>
|
||||
<dict>
|
||||
<key>localhost</key>
|
||||
<dict>
|
||||
<key>NSExceptionAllowsInsecureHTTPLoads</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
<dict>
|
||||
<key>NSAllowsArbitraryLoads</key>
|
||||
<false/>
|
||||
<key>NSAllowsLocalNetworking</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>Take photos to share with other users</string>
|
||||
<key>NSFaceIDUsageDescription</key>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
//
|
||||
// SSLPinning.h
|
||||
// RocketChatRN
|
||||
//
|
||||
// Created by Diego Mello on 11/07/23.
|
||||
// Copyright © 2023 Facebook. All rights reserved.
|
||||
//
|
||||
|
||||
#import <React/RCTHTTPRequestHandler.h>
|
||||
#import "RNFetchBlobRequest.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface RNFetchBlobRequest (Challenge)
|
||||
|
||||
@end
|
||||
|
||||
@interface RCTHTTPRequestHandler (Challenge)
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -0,0 +1,201 @@
|
|||
//
|
||||
// SSLPinning.m
|
||||
// RocketChatRN
|
||||
//
|
||||
// Created by Diego Mello on 11/07/23.
|
||||
// Copyright © 2023 Facebook. All rights reserved.
|
||||
//
|
||||
|
||||
#import <objc/runtime.h>
|
||||
#import "SSLPinning.h"
|
||||
#import "RNFetchBlobRequest.h"
|
||||
#import <MMKV/MMKV.h>
|
||||
#import <SDWebImage/SDWebImageDownloader.h>
|
||||
#import "SecureStorage.h"
|
||||
#import "SRWebSocket.h"
|
||||
|
||||
@implementation Challenge : NSObject
|
||||
+(NSURLCredential *)getUrlCredential:(NSURLAuthenticationChallenge *)challenge path:(NSString *)path password:(NSString *)password
|
||||
{
|
||||
NSString *authMethod = [[challenge protectionSpace] authenticationMethod];
|
||||
SecTrustRef serverTrust = challenge.protectionSpace.serverTrust;
|
||||
|
||||
if ([authMethod isEqualToString:NSURLAuthenticationMethodServerTrust] || path == nil || password == nil) {
|
||||
return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
} else if (path && password) {
|
||||
NSMutableArray *policies = [NSMutableArray array];
|
||||
[policies addObject:(__bridge_transfer id)SecPolicyCreateSSL(true, (__bridge CFStringRef)challenge.protectionSpace.host)];
|
||||
SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies);
|
||||
|
||||
SecTrustResultType result;
|
||||
SecTrustEvaluate(serverTrust, &result);
|
||||
|
||||
if (![[NSFileManager defaultManager] fileExistsAtPath:path])
|
||||
{
|
||||
return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
}
|
||||
|
||||
NSData *p12data = [NSData dataWithContentsOfFile:path];
|
||||
NSDictionary* options = @{ (id)kSecImportExportPassphrase:password };
|
||||
CFArrayRef rawItems = NULL;
|
||||
OSStatus status = SecPKCS12Import((__bridge CFDataRef)p12data,
|
||||
(__bridge CFDictionaryRef)options,
|
||||
&rawItems);
|
||||
|
||||
if (status != noErr) {
|
||||
return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
}
|
||||
|
||||
NSArray* items = (NSArray*)CFBridgingRelease(rawItems);
|
||||
NSDictionary* firstItem = nil;
|
||||
if ((status == errSecSuccess) && ([items count]>0)) {
|
||||
firstItem = items[0];
|
||||
}
|
||||
|
||||
SecIdentityRef identity = (SecIdentityRef)CFBridgingRetain(firstItem[(id)kSecImportItemIdentity]);
|
||||
SecCertificateRef certificate = NULL;
|
||||
if (identity) {
|
||||
SecIdentityCopyCertificate(identity, &certificate);
|
||||
if (certificate) { CFRelease(certificate); }
|
||||
}
|
||||
|
||||
NSMutableArray *certificates = [[NSMutableArray alloc] init];
|
||||
[certificates addObject:CFBridgingRelease(certificate)];
|
||||
|
||||
[SDWebImageDownloader sharedDownloader].config.urlCredential = [NSURLCredential credentialWithIdentity:identity certificates:certificates persistence:NSURLCredentialPersistenceNone];
|
||||
|
||||
return [NSURLCredential credentialWithIdentity:identity certificates:certificates persistence:NSURLCredentialPersistenceNone];
|
||||
}
|
||||
|
||||
return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
}
|
||||
|
||||
+(NSString *)stringToHex:(NSString *)string
|
||||
{
|
||||
char *utf8 = (char *)[string UTF8String];
|
||||
NSMutableString *hex = [NSMutableString string];
|
||||
while (*utf8) [hex appendFormat:@"%02X", *utf8++ & 0x00FF];
|
||||
|
||||
return [[NSString stringWithFormat:@"%@", hex] lowercaseString];
|
||||
}
|
||||
|
||||
+(void)runChallenge:(NSURLSession *)session
|
||||
didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
|
||||
completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
|
||||
{
|
||||
NSString *host = challenge.protectionSpace.host;
|
||||
|
||||
// Read the clientSSL info from MMKV
|
||||
__block NSString *clientSSL;
|
||||
SecureStorage *secureStorage = [[SecureStorage alloc] init];
|
||||
|
||||
// https://github.com/ammarahm-ed/react-native-mmkv-storage/blob/master/src/loader.js#L31
|
||||
NSString *key = [secureStorage getSecureKey:[self stringToHex:@"com.MMKV.default"]];
|
||||
NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
|
||||
if (key == NULL) {
|
||||
return completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, credential);
|
||||
}
|
||||
|
||||
NSData *cryptKey = [key dataUsingEncoding:NSUTF8StringEncoding];
|
||||
MMKV *mmkv = [MMKV mmkvWithID:@"default" cryptKey:cryptKey mode:MMKVMultiProcess];
|
||||
clientSSL = [mmkv getStringForKey:host];
|
||||
|
||||
if (clientSSL) {
|
||||
NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
|
||||
id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
|
||||
NSString *path = [dict objectForKey:@"path"];
|
||||
NSString *password = [dict objectForKey:@"password"];
|
||||
credential = [self getUrlCredential:challenge path:path password:password];
|
||||
}
|
||||
|
||||
completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation RNFetchBlobRequest (Challenge)
|
||||
|
||||
- (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credential))completionHandler
|
||||
{
|
||||
[Challenge runChallenge:session didReceiveChallenge:challenge completionHandler:completionHandler];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation RCTHTTPRequestHandler (Challenge)
|
||||
|
||||
- (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credential))completionHandler
|
||||
{
|
||||
[Challenge runChallenge:session didReceiveChallenge:challenge completionHandler:completionHandler];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation SRWebSocket (Challenge)
|
||||
|
||||
- (void)setClientSSL:(NSString *)path password:(NSString *)password options:(NSMutableDictionary *)options;
|
||||
{
|
||||
if ([[NSFileManager defaultManager] fileExistsAtPath:path])
|
||||
{
|
||||
NSData *pkcs12data = [[NSData alloc] initWithContentsOfFile:path];
|
||||
NSDictionary* certOptions = @{ (id)kSecImportExportPassphrase:password };
|
||||
CFArrayRef keyref = NULL;
|
||||
OSStatus sanityChesk = SecPKCS12Import((__bridge CFDataRef)pkcs12data,
|
||||
(__bridge CFDictionaryRef)certOptions,
|
||||
&keyref);
|
||||
if (sanityChesk == noErr) {
|
||||
CFDictionaryRef identityDict = (CFDictionaryRef)CFArrayGetValueAtIndex(keyref, 0);
|
||||
SecIdentityRef identityRef = (SecIdentityRef)CFDictionaryGetValue(identityDict, kSecImportItemIdentity);
|
||||
SecCertificateRef cert = NULL;
|
||||
OSStatus status = SecIdentityCopyCertificate(identityRef, &cert);
|
||||
if (!status) {
|
||||
NSArray *certificates = [[NSArray alloc] initWithObjects:(__bridge id)identityRef, (__bridge id)cert, nil];
|
||||
[options setObject:certificates forKey:(NSString *)kCFStreamSSLCertificates];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+(void)load
|
||||
{
|
||||
Method original, swizzled;
|
||||
|
||||
original = class_getInstanceMethod(objc_getClass("SRWebSocket"), @selector(_updateSecureStreamOptions));
|
||||
swizzled = class_getInstanceMethod(self, @selector(xxx_updateSecureStreamOptions));
|
||||
method_exchangeImplementations(original, swizzled);
|
||||
}
|
||||
|
||||
#pragma mark - Method Swizzling
|
||||
|
||||
- (void)xxx_updateSecureStreamOptions {
|
||||
[self xxx_updateSecureStreamOptions];
|
||||
|
||||
// Read the clientSSL info from MMKV
|
||||
NSMutableDictionary<NSString *, id> *SSLOptions = [NSMutableDictionary new];
|
||||
__block NSString *clientSSL;
|
||||
SecureStorage *secureStorage = [[SecureStorage alloc] init];
|
||||
|
||||
// https://github.com/ammarahm-ed/react-native-mmkv-storage/blob/master/src/loader.js#L31
|
||||
NSString *key = [secureStorage getSecureKey:[Challenge stringToHex:@"com.MMKV.default"]];
|
||||
|
||||
if (key != NULL) {
|
||||
NSData *cryptKey = [key dataUsingEncoding:NSUTF8StringEncoding];
|
||||
MMKV *mmkv = [MMKV mmkvWithID:@"default" cryptKey:cryptKey mode:MMKVMultiProcess];
|
||||
NSURLRequest *_urlRequest = [self valueForKey:@"_urlRequest"];
|
||||
|
||||
clientSSL = [mmkv getStringForKey:_urlRequest.URL.host];
|
||||
if (clientSSL) {
|
||||
NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
|
||||
id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
|
||||
NSString *path = [dict objectForKey:@"path"];
|
||||
NSString *password = [dict objectForKey:@"password"];
|
||||
[self setClientSSL:path password:password options:SSLOptions];
|
||||
if (SSLOptions) {
|
||||
id _outputStream = [self valueForKey:@"_outputStream"];
|
||||
[_outputStream setProperty:SSLOptions forKey:(__bridge id)kCFStreamPropertySSLSettings];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,27 +1,17 @@
|
|||
/**
|
||||
* Metro configuration for React Native
|
||||
* https://github.com/facebook/react-native
|
||||
*
|
||||
* @format
|
||||
*/
|
||||
|
||||
// eslint-disable-next-line import/no-extraneous-dependencies
|
||||
const blocklist = require('metro-config/src/defaults/exclusionList');
|
||||
|
||||
const defaultSourceExts = require('metro-config/src/defaults/defaults').sourceExts;
|
||||
const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
|
||||
|
||||
module.exports = {
|
||||
transformer: {
|
||||
getTransformOptions: () => ({
|
||||
transform: {
|
||||
// experimentalImportSupport: true,
|
||||
inlineRequires: true
|
||||
}
|
||||
})
|
||||
},
|
||||
maxWorkers: 2,
|
||||
/**
|
||||
* Metro configuration
|
||||
* https://facebook.github.io/metro/docs/configuration
|
||||
*
|
||||
* @type {import('metro-config').MetroConfig}
|
||||
*/
|
||||
const config = {
|
||||
resolver: {
|
||||
resolverMainFields: ['sbmodern', 'react-native', 'browser', 'main'],
|
||||
sourceExts: process.env.RUNNING_E2E_TESTS ? ['mock.ts', ...defaultSourceExts] : defaultSourceExts
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = mergeConfig(getDefaultConfig(__dirname), config);
|
||||
|
|
|
|||
91
package.json
91
package.json
|
|
@ -14,7 +14,7 @@
|
|||
"log-android": "react-native log-android",
|
||||
"snyk-protect": "snyk protect",
|
||||
"generate-source-maps-ios": "react-native bundle --platform ios --dev false --entry-file index.js --bundle-output ios-release.bundle --sourcemap-output ios-release.bundle.map",
|
||||
"postinstall": "patch-package && jetify",
|
||||
"postinstall": "patch-package",
|
||||
"build-icon-set": "node scripts/build-icon-set.js",
|
||||
"organize-translations": "node scripts/organize-translations.js",
|
||||
"e2e:android-build-debug": "yarn detox build -c android.emu.debug",
|
||||
|
|
@ -28,17 +28,17 @@
|
|||
"e2e:start": "RUNNING_E2E_TESTS=true npx react-native start"
|
||||
},
|
||||
"dependencies": {
|
||||
"@bugsnag/react-native": "^7.10.5",
|
||||
"@bugsnag/react-native": "^7.19.0",
|
||||
"@codler/react-native-keyboard-aware-scroll-view": "^2.0.1",
|
||||
"@gorhom/bottom-sheet": "^4.3.1",
|
||||
"@gorhom/bottom-sheet": "^4.4.5",
|
||||
"@hookform/resolvers": "^2.9.10",
|
||||
"@notifee/react-native": "^7.8.0",
|
||||
"@nozbe/watermelondb": "0.23.0",
|
||||
"@nozbe/watermelondb": "^0.25.5",
|
||||
"@react-native-async-storage/async-storage": "^1.17.11",
|
||||
"@react-native-camera-roll/camera-roll": "5.6.1",
|
||||
"@react-native-clipboard/clipboard": "^1.8.5",
|
||||
"@react-native-community/art": "^1.2.0",
|
||||
"@react-native-community/datetimepicker": "3.5.2",
|
||||
"@react-native-community/datetimepicker": "^7.6.2",
|
||||
"@react-native-community/hooks": "2.6.0",
|
||||
"@react-native-community/netinfo": "6.0.0",
|
||||
"@react-native-community/picker": "^1.8.1",
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
"@react-native-firebase/crashlytics": "^14.11.0",
|
||||
"@react-native-firebase/messaging": "^18.5.0",
|
||||
"@react-native-masked-view/masked-view": "^0.2.8",
|
||||
"@react-navigation/drawer": "6.4.1",
|
||||
"@react-navigation/elements": "^1.3.6",
|
||||
"@react-navigation/native": "6.0.10",
|
||||
"@react-navigation/stack": "6.2.1",
|
||||
"@react-navigation/drawer": "^6.6.2",
|
||||
"@react-navigation/elements": "^1.3.17",
|
||||
"@react-navigation/native": "^6.1.6",
|
||||
"@react-navigation/stack": "^6.3.16",
|
||||
"@rocket.chat/message-parser": "^0.31.26",
|
||||
"@rocket.chat/sdk": "RocketChat/Rocket.Chat.js.SDK#mobile",
|
||||
"@rocket.chat/ui-kit": "^0.31.19",
|
||||
|
|
@ -62,16 +62,16 @@
|
|||
"commonmark-react-renderer": "git+https://github.com/RocketChat/commonmark-react-renderer.git",
|
||||
"dequal": "^2.0.3",
|
||||
"ejson": "^2.2.3",
|
||||
"expo": "^46.0.9",
|
||||
"expo-apple-authentication": "4.2.1",
|
||||
"expo-av": "11.2.3",
|
||||
"expo": "48.0.9",
|
||||
"expo-apple-authentication": "6.0.1",
|
||||
"expo-av": "13.2.1",
|
||||
"expo-camera": "12.3.0",
|
||||
"expo-file-system": "14.0.0",
|
||||
"expo-haptics": "11.2.0",
|
||||
"expo-keep-awake": "10.1.1",
|
||||
"expo-local-authentication": "12.2.0",
|
||||
"expo-video-thumbnails": "6.3.0",
|
||||
"expo-web-browser": "10.2.1",
|
||||
"expo-file-system": "15.2.2",
|
||||
"expo-haptics": "12.2.1",
|
||||
"expo-keep-awake": "12.0.1",
|
||||
"expo-local-authentication": "13.3.0",
|
||||
"expo-video-thumbnails": "7.2.1",
|
||||
"expo-web-browser": "12.1.1",
|
||||
"hoist-non-react-statics": "3.3.2",
|
||||
"i18n-js": "3.9.2",
|
||||
"js-base64": "3.6.1",
|
||||
|
|
@ -83,21 +83,21 @@
|
|||
"moment": "2.29.4",
|
||||
"pretty-bytes": "5.6.0",
|
||||
"prop-types": "15.7.2",
|
||||
"react": "17.0.2",
|
||||
"react": "18.2.0",
|
||||
"react-hook-form": "^7.34.2",
|
||||
"react-native": "RocketChat/react-native#1b987e4ae3d5e912fda77da5215912ec15f14327",
|
||||
"react-native": "0.73.6",
|
||||
"react-native-animatable": "^1.3.3",
|
||||
"react-native-background-timer": "2.4.1",
|
||||
"react-native-bootsplash": "^4.3.3",
|
||||
"react-native-bootsplash": "^4.6.0",
|
||||
"react-native-config-reader": "^4.1.1",
|
||||
"react-native-console-time-polyfill": "1.2.3",
|
||||
"react-native-device-info": "^10.3.0",
|
||||
"react-native-document-picker": "^8.1.2",
|
||||
"react-native-easy-grid": "^0.2.2",
|
||||
"react-native-easy-toast": "1.2.0",
|
||||
"react-native-easy-toast": "^2.3.0",
|
||||
"react-native-fast-image": "RocketChat/react-native-fast-image.git#bump-version",
|
||||
"react-native-file-viewer": "^2.1.4",
|
||||
"react-native-gesture-handler": "2.4.2",
|
||||
"react-native-gesture-handler": "^2.15.0",
|
||||
"react-native-image-crop-picker": "RocketChat/react-native-image-crop-picker#54e1e1c7e7d4b731c74ce9dd1bf9eb5148065092",
|
||||
"react-native-image-progress": "^1.1.1",
|
||||
"react-native-katex": "^0.5.1",
|
||||
|
|
@ -113,21 +113,21 @@
|
|||
"react-native-orientation-locker": "1.1.8",
|
||||
"react-native-picker-select": "^8.0.4",
|
||||
"react-native-platform-touchable": "1.1.1",
|
||||
"react-native-popover-view": "4.0.1",
|
||||
"react-native-popover-view": "^5.1.7",
|
||||
"react-native-progress": "5.0.0",
|
||||
"react-native-prompt-android": "^1.1.0",
|
||||
"react-native-reanimated": "2.8.0",
|
||||
"react-native-reanimated": "^3.8.1",
|
||||
"react-native-restart": "0.0.22",
|
||||
"react-native-safe-area-context": "3.2.0",
|
||||
"react-native-screens": "3.29.0",
|
||||
"react-native-screens": "^3.29.0",
|
||||
"react-native-scrollable-tab-view": "ptomasroos/react-native-scrollable-tab-view",
|
||||
"react-native-simple-crypto": "RocketChat/react-native-simple-crypto#0.5.2",
|
||||
"react-native-skeleton-placeholder": "^5.2.3",
|
||||
"react-native-skeleton-placeholder": "^5.2.4",
|
||||
"react-native-slowlog": "^1.0.2",
|
||||
"react-native-svg": "13.8.0",
|
||||
"react-native-ui-lib": "RocketChat/react-native-ui-lib#ef50151b8d9c1627ef527c620a1472868f9f4df8",
|
||||
"react-native-ui-lib": "RocketChat/react-native-ui-lib#7.2.0",
|
||||
"react-native-url-polyfill": "2.0.0",
|
||||
"react-native-vector-icons": "9.1.0",
|
||||
"react-native-vector-icons": "^9.2.0",
|
||||
"react-native-webview": "11.26.1",
|
||||
"react-redux": "^8.0.5",
|
||||
"reactotron-react-native": "^5.0.3",
|
||||
|
|
@ -145,14 +145,16 @@
|
|||
"ua-parser-js": "^1.0.32",
|
||||
"uri-js": "^4.4.1",
|
||||
"url-parse": "1.5.10",
|
||||
"use-debounce": "^8.0.4",
|
||||
"use-debounce": "^9.0.4",
|
||||
"use-deep-compare-effect": "1.6.1",
|
||||
"xregexp": "5.0.2",
|
||||
"yup": "0.32.11"
|
||||
},
|
||||
"resolutions": {
|
||||
"ua-parser-js": "^1.0.2",
|
||||
"jpeg-js": "0.4.4"
|
||||
"jpeg-js": "0.4.4",
|
||||
"@types/react": "18",
|
||||
"react-native-reanimated": "3.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.20.2",
|
||||
|
|
@ -160,8 +162,13 @@
|
|||
"@babel/eslint-plugin": "^7.13.0",
|
||||
"@babel/plugin-proposal-decorators": "^7.8.3",
|
||||
"@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
|
||||
"@babel/runtime": "^7.12.5",
|
||||
"@babel/preset-env": "^7.20.0",
|
||||
"@babel/runtime": "^7.20.2",
|
||||
"@bugsnag/source-maps": "^2.2.0",
|
||||
"@react-native/babel-preset": "0.73.21",
|
||||
"@react-native/eslint-config": "0.73.2",
|
||||
"@react-native/metro-config": "0.73.5",
|
||||
"@react-native/typescript-config": "0.73.1",
|
||||
"@rocket.chat/eslint-config": "^0.4.0",
|
||||
"@storybook/addon-storyshots": "6.3",
|
||||
"@storybook/react": "6.3",
|
||||
|
|
@ -174,26 +181,26 @@
|
|||
"@types/jest": "^26.0.24",
|
||||
"@types/jsrsasign": "^10.5.8",
|
||||
"@types/lodash": "^4.14.188",
|
||||
"@types/react": "^17.0.14",
|
||||
"@types/react": "^18.2.6",
|
||||
"@types/react-native": "0.68.1",
|
||||
"@types/react-native-background-timer": "^2.0.0",
|
||||
"@types/react-native-config-reader": "^4.1.0",
|
||||
"@types/react-native-platform-touchable": "^1.1.2",
|
||||
"@types/react-native-scrollable-tab-view": "^0.10.2",
|
||||
"@types/react-native-vector-icons": "^6.4.12",
|
||||
"@types/react-test-renderer": "^17.0.1",
|
||||
"@types/react-test-renderer": "^18.0.0",
|
||||
"@types/semver": "7.3.13",
|
||||
"@types/ua-parser-js": "^0.7.36",
|
||||
"@types/url-parse": "^1.4.8",
|
||||
"@typescript-eslint/eslint-plugin": "^4.28.3",
|
||||
"@typescript-eslint/parser": "^4.28.5",
|
||||
"axios": "0.27.2",
|
||||
"babel-jest": "^28.1.3",
|
||||
"babel-jest": "^29.6.3",
|
||||
"babel-loader": "8.3.0",
|
||||
"babel-plugin-transform-remove-console": "^6.9.4",
|
||||
"codecov": "3.8.3",
|
||||
"detox": "20.17.1",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint": "^8.19.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-plugin-import": "2.26.0",
|
||||
"eslint-plugin-jest": "26.5.3",
|
||||
|
|
@ -202,18 +209,17 @@
|
|||
"eslint-plugin-react-hooks": "^4.5.0",
|
||||
"eslint-plugin-react-native": "4.0.0",
|
||||
"identity-obj-proxy": "^3.0.0",
|
||||
"jest": "^28.1.3",
|
||||
"jest": "^29.6.3",
|
||||
"jest-cli": "^28.1.3",
|
||||
"jest-expo": "^46.0.1",
|
||||
"jest-junit": "^15.0.0",
|
||||
"metro-react-native-babel-preset": "^0.67.0",
|
||||
"otp.js": "1.2.0",
|
||||
"patch-package": "8.0.0",
|
||||
"prettier": "^2.3.2",
|
||||
"prettier": "2.8.8",
|
||||
"react-16-node-hanging-test-fix": "^1.0.0",
|
||||
"react-dom": "17.0.1",
|
||||
"react-dom": "18.1.0",
|
||||
"react-native-dotenv": "3.4.8",
|
||||
"react-test-renderer": "17.0.2",
|
||||
"react-test-renderer": "18.2.0",
|
||||
"reactotron-redux": "3.1.3",
|
||||
"reactotron-redux-saga": "4.2.3",
|
||||
"ts-node": "^10.9.1",
|
||||
|
|
@ -224,8 +230,7 @@
|
|||
},
|
||||
"snyk": true,
|
||||
"engines": {
|
||||
"node": ">=8.x",
|
||||
"npm": ">=4.x"
|
||||
"node": ">=18"
|
||||
},
|
||||
"expo": {
|
||||
"autolinking": {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
diff --git a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
|
||||
index 802f137..cfcac91 100644
|
||||
index ca31e20..1c1bc24 100644
|
||||
--- a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
|
||||
+++ b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
|
||||
@@ -8,7 +8,7 @@ import android.database.sqlite.SQLiteDatabase
|
||||
import android.database.sqlite.SQLiteQuery
|
||||
import java.io.File
|
||||
|
||||
-class Database(private val name: String, private val context: Context) {
|
||||
+public class Database(private val name: String, private val context: Context) {
|
||||
|
||||
private val db: SQLiteDatabase by lazy {
|
||||
SQLiteDatabase.openOrCreateDatabase(
|
||||
@@ -44,7 +44,7 @@ class Database(private val name: String, private val context: Context) {
|
||||
-class Database(
|
||||
+public class Database(
|
||||
private val name: String,
|
||||
private val context: Context,
|
||||
private val openFlags: Int = SQLiteDatabase.CREATE_IF_NECESSARY or SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING
|
||||
@@ -49,7 +49,7 @@ class Database(
|
||||
|
||||
fun delete(query: SQL, args: QueryArgs) = db.execSQL(query, args)
|
||||
|
||||
|
|
@ -53,4 +53,4 @@ index b4d7151..429e318 100644
|
|||
+ public func queryRaw(_ query: SQL, _ args: QueryArgs = []) throws -> AnyIterator<FMResultSet> {
|
||||
let resultSet = try fmdb.executeQuery(query, values: args)
|
||||
|
||||
return AnyIterator {
|
||||
return AnyIterator {
|
||||
|
|
@ -1,21 +1,8 @@
|
|||
diff --git a/node_modules/expo-av/android/build.gradle b/node_modules/expo-av/android/build.gradle
|
||||
index e6e3424..f1a6ddc 100644
|
||||
--- a/node_modules/expo-av/android/build.gradle
|
||||
+++ b/node_modules/expo-av/android/build.gradle
|
||||
@@ -113,7 +113,7 @@ android {
|
||||
packagingOptions {
|
||||
// Gradle will add cmake target dependencies into packaging.
|
||||
// Theses files are intermediated linking files to build reanimated and should not be in final package.
|
||||
- excludes = [
|
||||
+ excludes += [
|
||||
"**/libc++_shared.so",
|
||||
"**/libreactnativejni.so",
|
||||
"**/libglog.so",
|
||||
diff --git a/node_modules/expo-av/android/src/main/java/expo/modules/av/player/datasource/SharedCookiesDataSourceFactory.java b/node_modules/expo-av/android/src/main/java/expo/modules/av/player/datasource/SharedCookiesDataSourceFactory.java
|
||||
index 19818bc..ae4f631 100644
|
||||
index 19818bc..7a7053b 100644
|
||||
--- a/node_modules/expo-av/android/src/main/java/expo/modules/av/player/datasource/SharedCookiesDataSourceFactory.java
|
||||
+++ b/node_modules/expo-av/android/src/main/java/expo/modules/av/player/datasource/SharedCookiesDataSourceFactory.java
|
||||
@@ -16,13 +16,21 @@ import okhttp3.OkHttpClient;
|
||||
@@ -16,13 +16,26 @@ import okhttp3.OkHttpClient;
|
||||
public class SharedCookiesDataSourceFactory implements DataSource.Factory {
|
||||
private final DataSource.Factory mDataSourceFactory;
|
||||
|
||||
|
|
@ -30,6 +17,11 @@ index 19818bc..ae4f631 100644
|
|||
- OkHttpClient.Builder builder = new OkHttpClient.Builder();
|
||||
- if (cookieHandler != null) {
|
||||
- builder.cookieJar(new JavaNetCookieJar(cookieHandler));
|
||||
+ // OkHttpClient.Builder builder = new OkHttpClient.Builder();
|
||||
+ // if (cookieHandler != null) {
|
||||
+ // builder.cookieJar(new JavaNetCookieJar(cookieHandler));
|
||||
+ // }
|
||||
+ // OkHttpClient client = builder.build();
|
||||
+ if (this.client == null) {
|
||||
+ OkHttpClient.Builder builder = new OkHttpClient.Builder();
|
||||
+ if (cookieHandler != null) {
|
||||
|
|
@ -40,4 +32,4 @@ index 19818bc..ae4f631 100644
|
|||
- OkHttpClient client = builder.build();
|
||||
mDataSourceFactory = new DefaultDataSourceFactory(reactApplicationContext, transferListener, new CustomHeadersOkHttpDataSourceFactory(client, userAgent, requestHeaders));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/node_modules/react-16-node-hanging-test-fix/index.js b/node_modules/react-16-node-hanging-test-fix/index.js
|
||||
index 4a3b342..442eef1 100644
|
||||
--- a/node_modules/react-16-node-hanging-test-fix/index.js
|
||||
+++ b/node_modules/react-16-node-hanging-test-fix/index.js
|
||||
@@ -16,7 +16,7 @@ if (Object.prototype.toString.call(process) !== '[object process]') {
|
||||
);
|
||||
}
|
||||
|
||||
-if (semverGt(version, '17.0.1')) {
|
||||
+if (semverGt(version, '17.0.2')) {
|
||||
console.error(
|
||||
'The `react-16-node-hanging-test-fix` package is no longer needed ' +
|
||||
'with React ' + version + ' and may cause issues. Remove this import.'
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js b/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js
|
||||
index 5ae42ec..273bbc0 100644
|
||||
--- a/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js
|
||||
+++ b/node_modules/react-native-reanimated/lib/reanimated2/jestUtils.js
|
||||
@@ -145,7 +145,8 @@ export const advanceAnimationByFrame = (count) => {
|
||||
jest.advanceTimersByTime(frameTime);
|
||||
};
|
||||
export const setUpTests = (userConfig = {}) => {
|
||||
- const expect = require('expect');
|
||||
+ // https://github.com/software-mansion/react-native-reanimated/issues/3215
|
||||
+ const { expect } = require('@jest/globals');
|
||||
require('setimmediate');
|
||||
frameTime = Math.round(1000 / config.fps);
|
||||
config = Object.assign(Object.assign({}, config), userConfig);
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
diff --git a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
|
||||
index 97255d2..4e0fe05 100644
|
||||
--- a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
|
||||
+++ b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
|
||||
@@ -364,6 +364,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
|
||||
- (void)ObservingInputAccessoryViewTempKeyboardWillDisappear:(ObservingInputAccessoryViewTemp *)ObservingInputAccessoryViewTemp
|
||||
{
|
||||
_bottomViewHeight = kBottomViewHeightTemp;
|
||||
+ _ObservingInputAccessoryViewTemp.height = 0;
|
||||
[self updateBottomViewFrame];
|
||||
}
|
||||
|
||||
diff --git a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m
|
||||
index 1ca52e8..69ac77a 100644
|
||||
--- a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m
|
||||
+++ b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m
|
||||
@@ -111,44 +111,57 @@ - (void)setHeight:(CGFloat)height
|
||||
_height = height;
|
||||
|
||||
[self invalidateIntrinsicContentSize];
|
||||
+ [_delegate ObservingInputAccessoryViewTempDidChangeFrame:self];
|
||||
}
|
||||
|
||||
- (void)_keyboardWillShowNotification:(NSNotification*)notification
|
||||
{
|
||||
- _keyboardState = KeyboardStateWillShow;
|
||||
+ if (_keyboardState == KeyboardStateHidden) {
|
||||
+ _keyboardState = KeyboardStateWillShow;
|
||||
|
||||
- [self invalidateIntrinsicContentSize];
|
||||
+ [self invalidateIntrinsicContentSize];
|
||||
|
||||
- if([_delegate respondsToSelector:@selector(ObservingInputAccessoryViewTempKeyboardWillAppear:keyboardDelta:)])
|
||||
- {
|
||||
- [_delegate ObservingInputAccessoryViewTempKeyboardWillAppear:self keyboardDelta:_keyboardHeight - _previousKeyboardHeight];
|
||||
+ if([_delegate respondsToSelector:@selector(ObservingInputAccessoryViewTempKeyboardWillAppear:keyboardDelta:)])
|
||||
+ {
|
||||
+ [_delegate ObservingInputAccessoryViewTempKeyboardWillAppear:self keyboardDelta:_keyboardHeight - _previousKeyboardHeight];
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
- (void)_keyboardDidShowNotification:(NSNotification*)notification
|
||||
{
|
||||
- _keyboardState = KeyboardStateShown;
|
||||
+ if (_keyboardState == KeyboardStateWillShow) {
|
||||
+ _keyboardState = KeyboardStateShown;
|
||||
|
||||
- [self invalidateIntrinsicContentSize];
|
||||
+ [self invalidateIntrinsicContentSize];
|
||||
+ }
|
||||
}
|
||||
|
||||
- (void)_keyboardWillHideNotification:(NSNotification*)notification
|
||||
{
|
||||
- _keyboardState = KeyboardStateWillHide;
|
||||
+ if (_keyboardState == KeyboardStateShown) {
|
||||
+ _keyboardState = KeyboardStateWillHide;
|
||||
|
||||
- [self invalidateIntrinsicContentSize];
|
||||
+ [self invalidateIntrinsicContentSize];
|
||||
|
||||
- if([_delegate respondsToSelector:@selector(ObservingInputAccessoryViewTempKeyboardWillDisappear:)])
|
||||
- {
|
||||
- [_delegate ObservingInputAccessoryViewTempKeyboardWillDisappear:self];
|
||||
+ [_delegate ObservingInputAccessoryViewTempDidChangeFrame:self];
|
||||
+
|
||||
+ if([_delegate respondsToSelector:@selector(ObservingInputAccessoryViewTempKeyboardWillDisappear:)])
|
||||
+ {
|
||||
+ [_delegate ObservingInputAccessoryViewTempKeyboardWillDisappear:self];
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
- (void)_keyboardDidHideNotification:(NSNotification*)notification
|
||||
{
|
||||
- _keyboardState = KeyboardStateHidden;
|
||||
+ if (_keyboardState == KeyboardStateWillHide) {
|
||||
+ _keyboardState = KeyboardStateHidden;
|
||||
|
||||
- [self invalidateIntrinsicContentSize];
|
||||
+ [self invalidateIntrinsicContentSize];
|
||||
+
|
||||
+ [_delegate ObservingInputAccessoryViewTempDidChangeFrame:self];
|
||||
+ }
|
||||
}
|
||||
|
||||
- (void)_keyboardWillChangeFrameNotification:(NSNotification*)notification
|
||||
|
|
@ -0,0 +1,392 @@
|
|||
diff --git a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h
|
||||
index b3864d0..e78322f 100644
|
||||
--- a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h
|
||||
+++ b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h
|
||||
@@ -8,7 +8,7 @@
|
||||
#if __has_include(<React/RCTEventEmitter.h>)
|
||||
#import <React/RCTEventEmitter.h>
|
||||
#else
|
||||
-#import "RCTEventEmitter.h"
|
||||
+#import <React/RCTEventEmitter.h>
|
||||
#endif
|
||||
|
||||
@interface RCTCustomInputControllerTemp : RCTEventEmitter
|
||||
diff --git a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h
|
||||
index 4344724..2786051 100644
|
||||
--- a/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h
|
||||
+++ b/node_modules/react-native-ui-lib/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#if __has_include(<React/RCTRootView.h>)
|
||||
#import <React/RCTRootView.h>
|
||||
#else
|
||||
-#import "RCTRootView.h"
|
||||
+#import <React/RCTRootView.h>
|
||||
#endif
|
||||
|
||||
@interface RCTCustomKeyboardViewControllerTemp : UIInputViewController
|
||||
diff --git a/node_modules/react-native-ui-lib/src/commons/Constants.ts b/node_modules/react-native-ui-lib/src/commons/Constants.ts
|
||||
index c029d61..77f60f7 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/commons/Constants.ts
|
||||
+++ b/node_modules/react-native-ui-lib/src/commons/Constants.ts
|
||||
@@ -139,7 +139,7 @@ const constants = {
|
||||
if (callback.remove) {
|
||||
callback.remove();
|
||||
} else {
|
||||
- Dimensions.removeEventListener('change', callback);
|
||||
+ // Dimensions.removeEventListener('change', callback);
|
||||
}
|
||||
},
|
||||
/* Accessibility */
|
||||
diff --git a/node_modules/react-native-ui-lib/src/commons/new.ts b/node_modules/react-native-ui-lib/src/commons/new.ts
|
||||
index c1da169..8d3c3f5 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/commons/new.ts
|
||||
+++ b/node_modules/react-native-ui-lib/src/commons/new.ts
|
||||
@@ -1,19 +1,19 @@
|
||||
// TODO: this file should replace commons/index.js
|
||||
export {default as UIComponent} from './UIComponent';
|
||||
-export {default as asBaseComponent, BaseComponentInjectedProps} from './asBaseComponent';
|
||||
-export {default as forwardRef, ForwardRefInjectedProps} from './forwardRef';
|
||||
-export {default as withScrollEnabler, WithScrollEnablerProps} from './withScrollEnabler';
|
||||
-export {default as withScrollReached, WithScrollReachedProps} from './withScrollReached';
|
||||
+export {default as asBaseComponent, type BaseComponentInjectedProps} from './asBaseComponent';
|
||||
+export {default as forwardRef, type ForwardRefInjectedProps} from './forwardRef';
|
||||
+export {default as withScrollEnabler, type WithScrollEnablerProps} from './withScrollEnabler';
|
||||
+export {default as withScrollReached, type WithScrollReachedProps} from './withScrollReached';
|
||||
export {default as Constants} from './Constants';
|
||||
export {default as Config} from './Config';
|
||||
|
||||
export {
|
||||
- ContainerModifiers,
|
||||
- AlignmentModifiers,
|
||||
- MarginModifiers,
|
||||
- PaddingModifiers,
|
||||
- TypographyModifiers,
|
||||
- ColorsModifiers,
|
||||
- BackgroundColorModifier,
|
||||
- FlexModifiers
|
||||
+ type ContainerModifiers,
|
||||
+ type AlignmentModifiers,
|
||||
+ type MarginModifiers,
|
||||
+ type PaddingModifiers,
|
||||
+ type TypographyModifiers,
|
||||
+ type ColorsModifiers,
|
||||
+ type BackgroundColorModifier,
|
||||
+ type FlexModifiers
|
||||
} from './modifiers';
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/connectionStatusBar/index.tsx b/node_modules/react-native-ui-lib/src/components/connectionStatusBar/index.tsx
|
||||
index 48884c9..76b4b43 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/connectionStatusBar/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/connectionStatusBar/index.tsx
|
||||
@@ -7,7 +7,7 @@ import TouchableOpacity from '../touchableOpacity';
|
||||
import View from '../view';
|
||||
import {Constants, asBaseComponent} from '../../commons/new';
|
||||
import {ConnectionStatusBarProps, ConnectionStatusBarState, DEFAULT_PROPS} from './Types';
|
||||
-export {ConnectionStatusBarProps};
|
||||
+export {type ConnectionStatusBarProps};
|
||||
|
||||
/**
|
||||
* @description: Top bar to show a "no internet" connection status. Note: Run on real device for best results
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/dialog/index.tsx b/node_modules/react-native-ui-lib/src/components/dialog/index.tsx
|
||||
index 4b51b27..7939884 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/dialog/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/dialog/index.tsx
|
||||
@@ -10,7 +10,7 @@ import PanListenerView from '../panningViews/panListenerView';
|
||||
import DialogDismissibleView from './DialogDismissibleView';
|
||||
import OverlayFadingBackground from './OverlayFadingBackground';
|
||||
import PanningProvider, {PanningDirections, PanningDirectionsEnum} from '../panningViews/panningProvider';
|
||||
-export {PanningDirections as DialogDirections, PanningDirectionsEnum as DialogDirectionsEnum};
|
||||
+export {type PanningDirections as DialogDirections, PanningDirectionsEnum as DialogDirectionsEnum};
|
||||
|
||||
// TODO: KNOWN ISSUES
|
||||
// 1. iOS pressing on the background while enter animation is happening will not call onDismiss
|
||||
@@ -278,6 +278,7 @@ function createStyles(props: DialogProps) {
|
||||
const {width = '90%', height} = props;
|
||||
const flexType = height ? {flex: 1} : {flex: 0};
|
||||
return StyleSheet.create({
|
||||
+ // @ts-ignore
|
||||
dialogViewSize: {width, height: height ?? undefined},
|
||||
flexType,
|
||||
container: {
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/drawer/index.tsx b/node_modules/react-native-ui-lib/src/components/drawer/index.tsx
|
||||
index e4f5ba7..4640a05 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/drawer/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/drawer/index.tsx
|
||||
@@ -409,7 +409,7 @@ class Drawer extends PureComponent<DrawerProps> {
|
||||
}
|
||||
}
|
||||
|
||||
-export {DrawerProps, DrawerItemProps};
|
||||
+export { type DrawerProps, type DrawerItemProps};
|
||||
export default asBaseComponent<DrawerProps, typeof Drawer>(Drawer);
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/listItem/ListItemPart.tsx b/node_modules/react-native-ui-lib/src/components/listItem/ListItemPart.tsx
|
||||
index 5ca3490..18df0af 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/listItem/ListItemPart.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/listItem/ListItemPart.tsx
|
||||
@@ -23,7 +23,7 @@ class ListItemPart extends Component<ListItemPartProps> {
|
||||
}
|
||||
}
|
||||
|
||||
-export {ListItemPartProps};
|
||||
+export {type ListItemPartProps};
|
||||
export default asBaseComponent<ListItemPartProps>(ListItemPart);
|
||||
|
||||
function createStyles({left, right, middle, column}: ListItemPartProps) {
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/loaderScreen/index.tsx b/node_modules/react-native-ui-lib/src/components/loaderScreen/index.tsx
|
||||
index bcd8c18..d391ab5 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/loaderScreen/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/loaderScreen/index.tsx
|
||||
@@ -39,7 +39,7 @@ class LoaderScreen extends Component<LoaderScreenProps> {
|
||||
}
|
||||
}
|
||||
|
||||
-export {LoaderScreenProps};
|
||||
+export {type LoaderScreenProps};
|
||||
export default asBaseComponent<LoaderScreenProps>(LoaderScreen);
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/marquee/index.tsx b/node_modules/react-native-ui-lib/src/components/marquee/index.tsx
|
||||
index 9c9a7d8..a512576 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/marquee/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/marquee/index.tsx
|
||||
@@ -101,7 +101,7 @@ function Marquee(props: MarqueeProps) {
|
||||
);
|
||||
}
|
||||
|
||||
-export {MarqueeProps, MarqueeDirections};
|
||||
+export {type MarqueeProps, MarqueeDirections};
|
||||
|
||||
export default Marquee;
|
||||
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/maskedInput/index.tsx b/node_modules/react-native-ui-lib/src/components/maskedInput/index.tsx
|
||||
index f00f2ab..c4b1737 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/maskedInput/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/maskedInput/index.tsx
|
||||
@@ -13,5 +13,5 @@ function MaskedInputMigrator(props: any, refToForward: any) {
|
||||
}
|
||||
}
|
||||
|
||||
-export {MaskedInputProps};
|
||||
+export {type MaskedInputProps};
|
||||
export default forwardRef(MaskedInputMigrator);
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/modal/index.tsx b/node_modules/react-native-ui-lib/src/components/modal/index.tsx
|
||||
index 7847d78..79063d5 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/modal/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/modal/index.tsx
|
||||
@@ -17,7 +17,7 @@ import View from '../../components/view';
|
||||
|
||||
const BlurView = BlurViewPackage?.BlurView;
|
||||
|
||||
-export {ModalTopBarProps};
|
||||
+export {type ModalTopBarProps};
|
||||
export interface ModalProps extends RNModalProps {
|
||||
/**
|
||||
* Blurs the modal background when transparent (iOS only)
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/segmentedControl/index.tsx b/node_modules/react-native-ui-lib/src/components/segmentedControl/index.tsx
|
||||
index 542a16a..b23336e 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/segmentedControl/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/segmentedControl/index.tsx
|
||||
@@ -7,7 +7,6 @@ import Reanimated, {
|
||||
useAnimatedStyle,
|
||||
useSharedValue,
|
||||
withTiming,
|
||||
- WithTimingConfig,
|
||||
runOnJS
|
||||
} from 'react-native-reanimated';
|
||||
import {Colors, BorderRadiuses, Spacings} from '../../style';
|
||||
@@ -16,7 +15,7 @@ import View from '../view';
|
||||
import Segment, {SegmentedControlItemProps as SegmentProps} from './segment';
|
||||
|
||||
const BORDER_WIDTH = 1;
|
||||
-const TIMING_CONFIG: WithTimingConfig = {
|
||||
+const TIMING_CONFIG = {
|
||||
duration: 300,
|
||||
easing: Easing.bezier(0.33, 1, 0.68, 1)
|
||||
};
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/stateScreen/index.tsx b/node_modules/react-native-ui-lib/src/components/stateScreen/index.tsx
|
||||
index 29bf95a..347a78e 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/stateScreen/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/stateScreen/index.tsx
|
||||
@@ -47,7 +47,7 @@ class StateScreen extends Component<StateScreenProps> {
|
||||
}
|
||||
}
|
||||
|
||||
-export {StateScreenProps};
|
||||
+export {type StateScreenProps};
|
||||
export default asBaseComponent<StateScreenProps>(StateScreen);
|
||||
|
||||
function createStyles(isRemoteImage: boolean) {
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/tabController/TabBarItem.tsx b/node_modules/react-native-ui-lib/src/components/tabController/TabBarItem.tsx
|
||||
index 7bb9245..16440be 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/tabController/TabBarItem.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/tabController/TabBarItem.tsx
|
||||
@@ -99,6 +99,7 @@ export interface TabControllerItemProps {
|
||||
interface Props extends TabControllerItemProps {
|
||||
index: number;
|
||||
targetPage: any; // TODO: typescript?
|
||||
+ // @ts-ignore
|
||||
currentPage: Reanimated.Adaptable<number>;
|
||||
onLayout?: (event: LayoutChangeEvent, index: number) => void;
|
||||
}
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/timeline/index.tsx b/node_modules/react-native-ui-lib/src/components/timeline/index.tsx
|
||||
index 158406a..456f56c 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/timeline/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/timeline/index.tsx
|
||||
@@ -6,12 +6,12 @@ import Point from './Point';
|
||||
import Line from './Line';
|
||||
import {TimelineProps, PointProps, LineProps, StateTypes, PointTypes, LineTypes, Layout} from './types';
|
||||
export {
|
||||
- TimelineProps,
|
||||
- PointProps as TimelinePointProps,
|
||||
- LineProps as TimelineLineProps,
|
||||
- StateTypes as TimelineStateTypes,
|
||||
- PointTypes as TimelinePointTypes,
|
||||
- LineTypes as TimelineLineTypes
|
||||
+ type TimelineProps,
|
||||
+ type PointProps as TimelinePointProps,
|
||||
+ type LineProps as TimelineLineProps,
|
||||
+ type StateTypes as TimelineStateTypes,
|
||||
+ type PointTypes as TimelinePointTypes,
|
||||
+ type LineTypes as TimelineLineTypes
|
||||
};
|
||||
|
||||
const CONTENT_CONTAINER_PADDINGS = Spacings.s2;
|
||||
diff --git a/node_modules/react-native-ui-lib/src/components/wizard/index.tsx b/node_modules/react-native-ui-lib/src/components/wizard/index.tsx
|
||||
index 8afc8a8..c086fcb 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/components/wizard/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/components/wizard/index.tsx
|
||||
@@ -7,7 +7,7 @@ import Shadows from '../../style/shadows';
|
||||
import WizardStep from './WizardStep';
|
||||
import {StatesConfig} from './WizardStates';
|
||||
import {WizardProps, WizardStepProps, WizardStepStates, WizardStepConfig, WizardStepsConfig} from './types';
|
||||
-export {WizardProps, WizardStepProps, WizardStepStates, WizardStepConfig, WizardStepsConfig};
|
||||
+export {type WizardProps, type WizardStepProps, WizardStepStates, type WizardStepConfig, type WizardStepsConfig};
|
||||
|
||||
interface State {
|
||||
maxWidth: number;
|
||||
diff --git a/node_modules/react-native-ui-lib/src/incubator/Dialog/index.tsx b/node_modules/react-native-ui-lib/src/incubator/Dialog/index.tsx
|
||||
index e624b8f..12c9fe9 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/incubator/Dialog/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/incubator/Dialog/index.tsx
|
||||
@@ -25,7 +25,7 @@ import {extractAlignmentsValues} from '../../commons/modifiers';
|
||||
import useHiddenLocation from '../hooks/useHiddenLocation';
|
||||
import DialogHeader from './DialogHeader';
|
||||
import {DialogProps, DialogDirections, DialogDirectionsEnum, DialogHeaderProps} from './types';
|
||||
-export {DialogProps, DialogDirections, DialogDirectionsEnum, DialogHeaderProps};
|
||||
+export {type DialogProps, type DialogDirections, DialogDirectionsEnum, type DialogHeaderProps};
|
||||
|
||||
const DEFAULT_OVERLAY_BACKGROUND_COLOR = Colors.rgba(Colors.grey20, 0.65);
|
||||
const THRESHOLD_VELOCITY = 750;
|
||||
@@ -199,6 +199,7 @@ const Dialog = (props: DialogProps, ref: ForwardedRef<DialogImperativeMethods>)
|
||||
|
||||
const renderDialog = () => (
|
||||
<GestureDetector gesture={panGesture}>
|
||||
+ {/* @ts-ignore */}
|
||||
<View {...containerProps} reanimated style={style} onLayout={onLayout} ref={setRef} testID={testID}>
|
||||
{headerProps && <DialogHeader {...headerProps}/>}
|
||||
{children}
|
||||
diff --git a/node_modules/react-native-ui-lib/src/incubator/Dialog/types.ts b/node_modules/react-native-ui-lib/src/incubator/Dialog/types.ts
|
||||
index a556bde..73c2369 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/incubator/Dialog/types.ts
|
||||
+++ b/node_modules/react-native-ui-lib/src/incubator/Dialog/types.ts
|
||||
@@ -7,7 +7,7 @@ import {TextProps} from '../../components/text';
|
||||
import {PanningDirections, PanningDirectionsEnum} from '../panView';
|
||||
type DialogDirections = PanningDirections;
|
||||
const DialogDirectionsEnum = PanningDirectionsEnum;
|
||||
-export {DialogDirections, DialogDirectionsEnum};
|
||||
+export {type DialogDirections, DialogDirectionsEnum};
|
||||
|
||||
export interface DialogHeaderProps extends ViewProps {
|
||||
/**
|
||||
diff --git a/node_modules/react-native-ui-lib/src/incubator/TextField/index.tsx b/node_modules/react-native-ui-lib/src/incubator/TextField/index.tsx
|
||||
index 0ba2020..0965094 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/incubator/TextField/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/incubator/TextField/index.tsx
|
||||
@@ -214,10 +214,10 @@ TextField.displayName = 'Incubator.TextField';
|
||||
TextField.validationMessagePositions = ValidationMessagePosition;
|
||||
|
||||
export {
|
||||
- TextFieldProps,
|
||||
- FieldContextType,
|
||||
- StaticMembers as TextFieldStaticMembers,
|
||||
- TextFieldMethods,
|
||||
+ type TextFieldProps,
|
||||
+ type FieldContextType,
|
||||
+ type StaticMembers as TextFieldStaticMembers,
|
||||
+ type TextFieldMethods,
|
||||
ValidationMessagePosition as TextFieldValidationMessagePosition
|
||||
};
|
||||
export default asBaseComponent<TextFieldProps, StaticMembers>(forwardRef(TextField as any), {
|
||||
diff --git a/node_modules/react-native-ui-lib/src/incubator/TouchableOpacity.tsx b/node_modules/react-native-ui-lib/src/incubator/TouchableOpacity.tsx
|
||||
index cb3d69d..5084ec8 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/incubator/TouchableOpacity.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/incubator/TouchableOpacity.tsx
|
||||
@@ -148,13 +148,11 @@ function TouchableOpacity(props: Props) {
|
||||
|
||||
return (
|
||||
<TapGestureHandler
|
||||
- // @ts-expect-error
|
||||
onGestureEvent={tapGestureHandler}
|
||||
shouldCancelWhenOutside
|
||||
enabled={!disabled}
|
||||
>
|
||||
<Reanimated.View>
|
||||
- {/* @ts-expect-error */}
|
||||
<Container onGestureEvent={longPressGestureHandler} shouldCancelWhenOutside>
|
||||
<Reanimated.View
|
||||
{...others}
|
||||
diff --git a/node_modules/react-native-ui-lib/src/incubator/index.ts b/node_modules/react-native-ui-lib/src/incubator/index.ts
|
||||
index 916d8ab..3711486 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/incubator/index.ts
|
||||
+++ b/node_modules/react-native-ui-lib/src/incubator/index.ts
|
||||
@@ -2,11 +2,11 @@
|
||||
export {default as ExpandableOverlay} from './expandableOverlay';
|
||||
// @ts-ignore
|
||||
export {default as TextField, TextFieldProps, FieldContextType, TextFieldMethods, TextFieldValidationMessagePosition} from './TextField';
|
||||
-export {default as Toast, ToastProps, ToastPresets} from './toast';
|
||||
-export {default as TouchableOpacity, TouchableOpacityProps} from './TouchableOpacity';
|
||||
-export {default as PanView, PanViewProps, PanViewDirections, PanViewDismissThreshold} from './panView';
|
||||
+export {default as Toast, type ToastProps, ToastPresets} from './toast';
|
||||
+export {default as TouchableOpacity, type TouchableOpacityProps} from './TouchableOpacity';
|
||||
+export {default as PanView, type PanViewProps, type PanViewDirections, type PanViewDismissThreshold} from './panView';
|
||||
export {default as Slider} from './Slider';
|
||||
-export {default as Dialog, DialogProps, DialogHeaderProps, DialogStatics, DialogImperativeMethods} from './Dialog';
|
||||
+export {default as Dialog, type DialogProps, type DialogHeaderProps, type DialogStatics, type DialogImperativeMethods} from './Dialog';
|
||||
// TODO: delete exports after fully removing from private
|
||||
-export {default as ChipsInput, ChipsInputProps, ChipsInputChangeReason, ChipsInputChipProps} from '../components/chipsInput';
|
||||
-export {default as WheelPicker, WheelPickerProps, WheelPickerItemProps, WheelPickerAlign} from '../components/WheelPicker';
|
||||
+export {default as ChipsInput, type ChipsInputProps, ChipsInputChangeReason, type ChipsInputChipProps} from '../components/chipsInput';
|
||||
+export {default as WheelPicker, type WheelPickerProps, type WheelPickerItemProps, WheelPickerAlign} from '../components/WheelPicker';
|
||||
diff --git a/node_modules/react-native-ui-lib/src/incubator/panView/index.tsx b/node_modules/react-native-ui-lib/src/incubator/panView/index.tsx
|
||||
index 346d706..eb2f04e 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/incubator/panView/index.tsx
|
||||
+++ b/node_modules/react-native-ui-lib/src/incubator/panView/index.tsx
|
||||
@@ -16,11 +16,11 @@ import usePanGesture, {
|
||||
DEFAULT_ANIMATION_CONFIG
|
||||
} from './usePanGesture';
|
||||
export {
|
||||
- PanningDirections,
|
||||
+ type PanningDirections,
|
||||
PanningDirectionsEnum,
|
||||
- PanViewDirections,
|
||||
+ type PanViewDirections,
|
||||
PanViewDirectionsEnum,
|
||||
- PanViewDismissThreshold,
|
||||
+ type PanViewDismissThreshold,
|
||||
DEFAULT_DIRECTIONS,
|
||||
DEFAULT_ANIMATION_CONFIG
|
||||
};
|
||||
diff --git a/node_modules/react-native-ui-lib/src/style/index.ts b/node_modules/react-native-ui-lib/src/style/index.ts
|
||||
index da8cb97..995207b 100644
|
||||
--- a/node_modules/react-native-ui-lib/src/style/index.ts
|
||||
+++ b/node_modules/react-native-ui-lib/src/style/index.ts
|
||||
@@ -1,7 +1,7 @@
|
||||
export {default as Colors} from './colors';
|
||||
export {default as DesignTokens} from './designTokens';
|
||||
export {default as DesignTokensDM} from './designTokensDM';
|
||||
-export {default as Scheme, SchemeType, Schemes, SchemeChangeListener} from './scheme';
|
||||
+export {default as Scheme, type SchemeType, type Schemes, type SchemeChangeListener} from './scheme';
|
||||
export {default as Typography} from './typography';
|
||||
export {default as BorderRadiuses} from './borderRadiuses';
|
||||
export {default as Shadows} from './shadows';
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
|
||||
index 602d51d..920d975 100644
|
||||
--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
|
||||
+++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
|
||||
@@ -38,7 +38,7 @@ import static com.RNFetchBlob.RNFetchBlobConst.GET_CONTENT_INTENT;
|
||||
|
||||
public class RNFetchBlob extends ReactContextBaseJavaModule {
|
||||
|
||||
- private final OkHttpClient mClient;
|
||||
+ static private OkHttpClient mClient;
|
||||
|
||||
static ReactApplicationContext RCTContext;
|
||||
private static LinkedBlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue<>();
|
||||
@@ -75,6 +75,10 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
|
||||
});
|
||||
}
|
||||
|
||||
+ public static void applyCustomOkHttpClient(OkHttpClient client) {
|
||||
+ mClient = client;
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
public String getName() {
|
||||
return "RNFetchBlob";
|
||||
diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m b/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m
|
||||
index cdbe6b1..04e5e7b 100644
|
||||
--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m
|
||||
+++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m
|
||||
@@ -15,6 +15,9 @@
|
||||
#import "IOS7Polyfill.h"
|
||||
#import <CommonCrypto/CommonDigest.h>
|
||||
|
||||
+#import "SecureStorage.h"
|
||||
+#import <MMKV/MMKV.h>
|
||||
+
|
||||
|
||||
typedef NS_ENUM(NSUInteger, ResponseFormat) {
|
||||
UTF8,
|
||||
@@ -450,16 +453,108 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSen
|
||||
}
|
||||
}
|
||||
|
||||
-
|
||||
-- (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credantial))completionHandler
|
||||
+-(NSURLCredential *)getUrlCredential:(NSURLAuthenticationChallenge *)challenge path:(NSString *)path password:(NSString *)password
|
||||
{
|
||||
- if ([[options valueForKey:CONFIG_TRUSTY] boolValue]) {
|
||||
- completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
|
||||
- } else {
|
||||
- completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
|
||||
+ NSString *authMethod = [[challenge protectionSpace] authenticationMethod];
|
||||
+ SecTrustRef serverTrust = challenge.protectionSpace.serverTrust;
|
||||
+
|
||||
+ if ([authMethod isEqualToString:NSURLAuthenticationMethodServerTrust] || path == nil || password == nil) {
|
||||
+ return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
+ } else if (path && password) {
|
||||
+ NSMutableArray *policies = [NSMutableArray array];
|
||||
+ [policies addObject:(__bridge_transfer id)SecPolicyCreateSSL(true, (__bridge CFStringRef)challenge.protectionSpace.host)];
|
||||
+ SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies);
|
||||
+
|
||||
+ SecTrustResultType result;
|
||||
+ SecTrustEvaluate(serverTrust, &result);
|
||||
+
|
||||
+ if (![[NSFileManager defaultManager] fileExistsAtPath:path])
|
||||
+ {
|
||||
+ return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
+ }
|
||||
+
|
||||
+ NSData *p12data = [NSData dataWithContentsOfFile:path];
|
||||
+ NSDictionary* options = @{ (id)kSecImportExportPassphrase:password };
|
||||
+ CFArrayRef rawItems = NULL;
|
||||
+ OSStatus status = SecPKCS12Import((__bridge CFDataRef)p12data,
|
||||
+ (__bridge CFDictionaryRef)options,
|
||||
+ &rawItems);
|
||||
+
|
||||
+ if (status != noErr) {
|
||||
+ return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
+ }
|
||||
+
|
||||
+ NSArray* items = (NSArray*)CFBridgingRelease(rawItems);
|
||||
+ NSDictionary* firstItem = nil;
|
||||
+ if ((status == errSecSuccess) && ([items count]>0)) {
|
||||
+ firstItem = items[0];
|
||||
}
|
||||
+
|
||||
+ SecIdentityRef identity = (SecIdentityRef)CFBridgingRetain(firstItem[(id)kSecImportItemIdentity]);
|
||||
+ SecCertificateRef certificate = NULL;
|
||||
+ if (identity) {
|
||||
+ SecIdentityCopyCertificate(identity, &certificate);
|
||||
+ if (certificate) { CFRelease(certificate); }
|
||||
+ }
|
||||
+
|
||||
+ NSMutableArray *certificates = [[NSMutableArray alloc] init];
|
||||
+ [certificates addObject:CFBridgingRelease(certificate)];
|
||||
+
|
||||
+ return [NSURLCredential credentialWithIdentity:identity certificates:certificates persistence:NSURLCredentialPersistenceNone];
|
||||
+ }
|
||||
+
|
||||
+ return [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
+}
|
||||
+
|
||||
+- (NSString *)stringToHex:(NSString *)string
|
||||
+{
|
||||
+ char *utf8 = (char *)[string UTF8String];
|
||||
+ NSMutableString *hex = [NSMutableString string];
|
||||
+ while (*utf8) [hex appendFormat:@"%02X", *utf8++ & 0x00FF];
|
||||
+
|
||||
+ return [[NSString stringWithFormat:@"%@", hex] lowercaseString];
|
||||
}
|
||||
|
||||
+-(void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler
|
||||
+{
|
||||
+ NSString *host = challenge.protectionSpace.host;
|
||||
+
|
||||
+ // Read the clientSSL info from MMKV
|
||||
+ __block NSString *clientSSL;
|
||||
+ SecureStorage *secureStorage = [[SecureStorage alloc] init];
|
||||
+
|
||||
+ // https://github.com/ammarahm-ed/react-native-mmkv-storage/blob/master/src/loader.js#L31
|
||||
+ NSString *key = [secureStorage getSecureKey:[self stringToHex:@"com.MMKV.default"]];
|
||||
+ NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
|
||||
+
|
||||
+ if (key == NULL) {
|
||||
+ return completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, credential);
|
||||
+ }
|
||||
+
|
||||
+ NSData *cryptKey = [key dataUsingEncoding:NSUTF8StringEncoding];
|
||||
+ MMKV *mmkv = [MMKV mmkvWithID:@"default" cryptKey:cryptKey mode:MMKVMultiProcess];
|
||||
+ clientSSL = [mmkv getStringForKey:host];
|
||||
+
|
||||
+ if ([clientSSL length] != 0) {
|
||||
+ NSData *data = [clientSSL dataUsingEncoding:NSUTF8StringEncoding];
|
||||
+ id dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
|
||||
+ NSString *path = [dict objectForKey:@"path"];
|
||||
+ NSString *password = [dict objectForKey:@"password"];
|
||||
+ credential = [self getUrlCredential:challenge path:path password:password];
|
||||
+ }
|
||||
+
|
||||
+ completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
|
||||
+}
|
||||
+
|
||||
+// - (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credantial))completionHandler
|
||||
+// {
|
||||
+// if ([[options valueForKey:CONFIG_TRUSTY] boolValue]) {
|
||||
+// completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
|
||||
+// } else {
|
||||
+// completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
|
||||
+// }
|
||||
+// }
|
||||
+
|
||||
|
||||
- (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session
|
||||
{
|
||||
Loading…
Reference in New Issue