Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/mobile/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
MIN_SUPPORTED_IPHONEOS_VERSION = '17.1'
BUILD_AS_DYNAMIC_FRAMEWORK = ['Tor']

require_relative '../node_modules/react-native/scripts/react_native_pods'

Expand All @@ -9,15 +10,16 @@ install! 'cocoapods', :deterministic_uuids => false,
:parallel_pod_downloads => true,
:parallel_pod_download_thread_pool_size => 40

use_frameworks! :linkage => :static

# React native 0.76 defaults to using new architecture
# Disable New Architecture
ENV['RCT_NEW_ARCH_ENABLED'] = '0'

target 'Quiet' do
use_frameworks! :linkage => :static
config = use_native_modules!

pod 'Tor', podspec: 'https://raw.githubusercontent.com/iCepa/Tor.framework/v405.9.1/Tor.podspec'
pod 'Tor', '~> 409'
pod 'FirebaseCore', '~> 10.20.0'
pod 'FirebaseMessaging', '~> 10.20.0'
pod 'FirebaseInstallations', '~> 10.20.0'
Expand All @@ -33,10 +35,10 @@ target 'Quiet' do
# Make all the other frameworks into static frameworks by overriding the static_framework? function to return true
pre_install do |installer|
installer.pod_targets.each do |target|
# Make some targets static as they throw errors if not
if target.name.eql?('RNScreens') || target.name.eql?('react-native-image-picker') or target.name.eql?('RNCClipboard')
if BUILD_AS_DYNAMIC_FRAMEWORK.include? target.name
puts "\n\tDynamically Linking #{BUILD_AS_DYNAMIC_FRAMEWORK.length} Targets:\n\t#{BUILD_AS_DYNAMIC_FRAMEWORK.inspect}"
def target.build_type;
Pod::BuildType.static_library
Pod::BuildType.dynamic_framework
end
end
end
Expand Down
15 changes: 9 additions & 6 deletions packages/mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,11 @@ PODS:
- SDWebImage/Core (~> 5.17)
- SocketRocket (0.7.1)
- SSZipArchive (2.6.0)
- Tor (405.9.1)
- Tor (409.5.1):
- Tor/CTor (= 409.5.1)
- Tor/Core (409.5.1)
- Tor/CTor (409.5.1):
- Tor/Core
- Yoga (0.0.0)

DEPENDENCIES:
Expand Down Expand Up @@ -1818,7 +1822,7 @@ DEPENDENCIES:
- RNScreens (from `../node_modules/react-native-screens`)
- RNShare (from `../node_modules/react-native-share`)
- RNSVG (from `../node_modules/react-native-svg`)
- Tor (from `https://raw.githubusercontent.com/iCepa/Tor.framework/v405.9.1/Tor.podspec`)
- Tor (~> 409)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
Expand All @@ -1840,6 +1844,7 @@ SPEC REPOS:
- SDWebImageWebPCoder
- SocketRocket
- SSZipArchive
- Tor

EXTERNAL SOURCES:
boost:
Expand Down Expand Up @@ -2009,8 +2014,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-share"
RNSVG:
:path: "../node_modules/react-native-svg"
Tor:
:podspec: https://raw.githubusercontent.com/iCepa/Tor.framework/v405.9.1/Tor.podspec
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"

Expand Down Expand Up @@ -2115,9 +2118,9 @@ SPEC CHECKSUMS:
SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
Tor: 39dc71bf048312e202608eb499ca5c74e841b503
Tor: fb12b6bcfa1309d3e40e98908eabd28e5ff4bb61
Yoga: 1a10502f162e8fc40ff0907c82d01cfe555d00c2

PODFILE CHECKSUM: 1f3635b9a52a9f3267675c779818f1eab5bb5304
PODFILE CHECKSUM: f100d714c59ce5cdd631dff12815177b4005af27

COCOAPODS: 1.16.2
22 changes: 4 additions & 18 deletions packages/mobile/ios/Quiet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -5138,14 +5138,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet-QuietTests/Pods-Quiet-QuietTests-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet-QuietTests/Pods-Quiet-QuietTests-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Quiet-QuietTests/Pods-Quiet-QuietTests-resources.sh\"\n";
Expand Down Expand Up @@ -5203,14 +5199,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet/Pods-Quiet-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet/Pods-Quiet-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Quiet/Pods-Quiet-frameworks.sh\"\n";
Expand All @@ -5224,14 +5216,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet/Pods-Quiet-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet/Pods-Quiet-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Quiet/Pods-Quiet-resources.sh\"\n";
Expand All @@ -5245,14 +5233,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet-QuietTests/Pods-Quiet-QuietTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Quiet-QuietTests/Pods-Quiet-QuietTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Quiet-QuietTests/Pods-Quiet-QuietTests-frameworks.sh\"\n";
Expand Down Expand Up @@ -5350,7 +5334,7 @@
"$(inherited)",
);
INFOPLIST_FILE = QuietTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -5382,7 +5366,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = QuietTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -5629,6 +5613,7 @@
CXX = "";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
Expand Down Expand Up @@ -5720,6 +5705,7 @@
CXX = "";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2610"
LastUpgradeVersion = "2630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2610"
LastUpgradeVersion = "2630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2610"
LastUpgradeVersion = "2630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 3 additions & 1 deletion packages/mobile/ios/Quiet/AppDelegate.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#import <RCTAppDelegate.h>
#import <UIKit/UIKit.h>
#import <Tor/Tor.h>
#import <Tor/TORConfiguration.h>
#import <Tor/TORController.h>
#import <Tor/TORControlReplyCode.h>
#import <UserNotifications/UserNotifications.h>

#import "RNNodeJsMobile.h"
Expand Down
1 change: 0 additions & 1 deletion packages/mobile/ios/TorHandler.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Tor

@objc(TorHandler)
class TorHandler: NSObject {

@objc(getTorConfiguration:controlPort:httpTunnelPort:)
Expand Down
Loading