From ff09ee3e79dd422252c1e111d1d30793777ee416 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 25 Jan 2021 13:31:38 +1100 Subject: [PATCH] Delete unused files --- Podfile | 4 ++-- Podfile.lock | 4 ++-- Protos/Makefile | 12 ----------- Protos/OWSWebRtcDataProtos.proto | 37 -------------------------------- 4 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 Protos/Makefile delete mode 100644 Protos/OWSWebRtcDataProtos.proto diff --git a/Podfile b/Podfile index 40b9f4a76..fad76fa3f 100644 --- a/Podfile +++ b/Podfile @@ -12,7 +12,7 @@ target 'Session' do pod 'PromiseKit', :inhibit_warnings => true pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true pod 'Reachability', :inhibit_warnings => true - pod 'Sodium', :inhibit_warnings => true + pod 'Sodium', '~> 0.8.0', :inhibit_warnings => true pod 'SSZipArchive', :inhibit_warnings => true pod 'Starscream', git: 'https://github.com/signalapp/Starscream.git', branch: 'signal-release', :inhibit_warnings => true pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true @@ -71,7 +71,7 @@ target 'SessionMessagingKit' do pod 'Reachability', :inhibit_warnings => true pod 'SAMKeychain', :inhibit_warnings => true pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true - pod 'Sodium', :inhibit_warnings => true + pod 'Sodium', '~> 0.8.0', :inhibit_warnings => true pod 'SwiftProtobuf', '~> 1.5.0', :inhibit_warnings => true pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true end diff --git a/Podfile.lock b/Podfile.lock index caf962654..d3c81a4e9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -140,7 +140,7 @@ DEPENDENCIES: - Reachability - SAMKeychain - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`) - - Sodium + - Sodium (~> 0.8.0) - SSZipArchive - Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`) - SwiftProtobuf (~> 1.5.0) @@ -230,6 +230,6 @@ SPEC CHECKSUMS: YYImage: 6db68da66f20d9f169ceb94dfb9947c3867b9665 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 3263ab95f60e220882ca53cca4c6bdc2e7a80381 +PODFILE CHECKSUM: e639c728c4ea2a89f3e904f3a07d380c7459bdd9 COCOAPODS: 1.10.0.rc.1 diff --git a/Protos/Makefile b/Protos/Makefile deleted file mode 100644 index 828a82e6b..000000000 --- a/Protos/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -PROTOC=protoc \ - --proto_path='./' -WRAPPER_SCRIPT=../Scripts/ProtoWrappers.py \ - --proto-dir='./' --verbose - -all: webrtc_data_proto - -webrtc_data_proto: OWSWebRTCDataProtos.proto - $(PROTOC) --swift_out=../Signal/src/Generated \ - OWSWebRTCDataProtos.proto - $(WRAPPER_SCRIPT) --dst-dir=../Signal/src/Generated \ - --wrapper-prefix=WebRTCProto --proto-prefix=WebRTCProtos --proto-file=OWSWebRTCDataProtos.proto diff --git a/Protos/OWSWebRtcDataProtos.proto b/Protos/OWSWebRtcDataProtos.proto deleted file mode 100644 index 36664807f..000000000 --- a/Protos/OWSWebRtcDataProtos.proto +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -// iOS - since we use a modern proto-compiler, we must specify -// the legacy proto format. -syntax = "proto2"; - -// iOS - package name determines class prefix -package WebRTCProtos; - -option java_package = "org.thoughtcrime.securesms.webrtc"; -option java_outer_classname = "WebRtcDataProtos"; - -message Connected { - // @required - optional uint64 id = 1; -} - -message Hangup { - // @required - optional uint64 id = 1; -} - -message VideoStreamingStatus { - // @required - optional uint64 id = 1; - optional bool enabled = 2; -} - -message Data { - optional Connected connected = 1; - optional Hangup hangup = 2; - optional VideoStreamingStatus videoStreamingStatus = 3; -}