mirror of
https://github.com/vector-im/element-ios.git
synced 2024-10-01 16:52:40 +00:00
revert a few files that should not have been checked in
This commit is contained in:
parent
0865862078
commit
b97e103ada
4 changed files with 13 additions and 32 deletions
|
@ -295,7 +295,7 @@ final class BuildSettings: NSObject {
|
||||||
static let roomSettingsScreenShowFlairSettings: Bool = true
|
static let roomSettingsScreenShowFlairSettings: Bool = true
|
||||||
static let roomSettingsScreenShowAdvancedSettings: Bool = true
|
static let roomSettingsScreenShowAdvancedSettings: Bool = true
|
||||||
static let roomSettingsScreenAdvancedShowEncryptToVerifiedOption: Bool = true
|
static let roomSettingsScreenAdvancedShowEncryptToVerifiedOption: Bool = true
|
||||||
static let roomSettingsScreenShowNotificationsV2: Bool = true
|
static let roomSettingsScreenShowNotificationsV2: Bool = false
|
||||||
|
|
||||||
// MARK: - Room Member Screen
|
// MARK: - Room Member Screen
|
||||||
|
|
||||||
|
@ -309,10 +309,6 @@ final class BuildSettings: NSObject {
|
||||||
static let messageDetailsAllowCopyMedia: Bool = true
|
static let messageDetailsAllowCopyMedia: Bool = true
|
||||||
static let messageDetailsAllowPasteMedia: Bool = true
|
static let messageDetailsAllowPasteMedia: Bool = true
|
||||||
|
|
||||||
// MARK: - Voice Message
|
|
||||||
|
|
||||||
static let voiceMessagesEnabled = false
|
|
||||||
|
|
||||||
// MARK: - Notifications
|
// MARK: - Notifications
|
||||||
static let decryptNotificationsByDefault: Bool = true
|
static let decryptNotificationsByDefault: Bool = true
|
||||||
|
|
||||||
|
|
4
Podfile
4
Podfile
|
@ -11,9 +11,9 @@ use_frameworks!
|
||||||
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
|
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
|
||||||
#
|
#
|
||||||
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
|
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
|
||||||
# $matrixKitVersion = '= 0.15.6'
|
$matrixKitVersion = '= 0.15.6'
|
||||||
# $matrixKitVersion = :local
|
# $matrixKitVersion = :local
|
||||||
$matrixKitVersion = {'develop' => 'develop'}
|
# $matrixKitVersion = {'develop' => 'develop'}
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
|
|
||||||
|
|
26
Podfile.lock
26
Podfile.lock
|
@ -124,9 +124,9 @@ DEPENDENCIES:
|
||||||
- KeychainAccess (~> 4.2.2)
|
- KeychainAccess (~> 4.2.2)
|
||||||
- KTCenterFlowLayout (~> 1.3.1)
|
- KTCenterFlowLayout (~> 1.3.1)
|
||||||
- MatomoTracker (~> 7.4.1)
|
- MatomoTracker (~> 7.4.1)
|
||||||
- MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
|
- MatrixKit (= 0.15.6)
|
||||||
- MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
|
- MatrixSDK
|
||||||
- MatrixSDK/JingleCallStack (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
|
- MatrixSDK/JingleCallStack
|
||||||
- OLMKit
|
- OLMKit
|
||||||
- ReadMoreTextView (~> 3.0.1)
|
- ReadMoreTextView (~> 3.0.1)
|
||||||
- Reusable (~> 4.1)
|
- Reusable (~> 4.1)
|
||||||
|
@ -164,6 +164,8 @@ SPEC REPOS:
|
||||||
- LoggerAPI
|
- LoggerAPI
|
||||||
- Logging
|
- Logging
|
||||||
- MatomoTracker
|
- MatomoTracker
|
||||||
|
- MatrixKit
|
||||||
|
- MatrixSDK
|
||||||
- OLMKit
|
- OLMKit
|
||||||
- ReadMoreTextView
|
- ReadMoreTextView
|
||||||
- Realm
|
- Realm
|
||||||
|
@ -177,22 +179,6 @@ SPEC REPOS:
|
||||||
- zxcvbn-ios
|
- zxcvbn-ios
|
||||||
- ZXingObjC
|
- ZXingObjC
|
||||||
|
|
||||||
EXTERNAL SOURCES:
|
|
||||||
MatrixKit:
|
|
||||||
:branch: develop
|
|
||||||
:git: https://github.com/matrix-org/matrix-ios-kit.git
|
|
||||||
MatrixSDK:
|
|
||||||
:branch: develop
|
|
||||||
:git: https://github.com/matrix-org/matrix-ios-sdk.git
|
|
||||||
|
|
||||||
CHECKOUT OPTIONS:
|
|
||||||
MatrixKit:
|
|
||||||
:commit: dae868f96bb3b116f0fe0ce74cd1feca0049f59e
|
|
||||||
:git: https://github.com/matrix-org/matrix-ios-kit.git
|
|
||||||
MatrixSDK:
|
|
||||||
:commit: 3404e154108f38f9eaed8e161c3a66cd9f74198d
|
|
||||||
:git: https://github.com/matrix-org/matrix-ios-sdk.git
|
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
|
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
|
||||||
BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
|
BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
|
||||||
|
@ -233,6 +219,6 @@ SPEC CHECKSUMS:
|
||||||
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
||||||
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
||||||
|
|
||||||
PODFILE CHECKSUM: 83b17e47b31a75c05ad3ce7418fd5f7a7a3a8122
|
PODFILE CHECKSUM: c1f1d1137ebacb6c74706cb28d5c10f26d6fe655
|
||||||
|
|
||||||
COCOAPODS: 1.10.1
|
COCOAPODS: 1.10.1
|
||||||
|
|
|
@ -4,8 +4,7 @@
|
||||||
version = "1.3">
|
version = "1.3">
|
||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
buildImplicitDependencies = "YES"
|
buildImplicitDependencies = "YES">
|
||||||
runPostActionsOnFailure = "NO">
|
|
||||||
<BuildActionEntries>
|
<BuildActionEntries>
|
||||||
<BuildActionEntry
|
<BuildActionEntry
|
||||||
buildForTesting = "YES"
|
buildForTesting = "YES"
|
||||||
|
|
Loading…
Reference in a new issue