Disable refresh tokens and revert pod and lockfile

This commit is contained in:
David Langley 2022-01-31 00:28:31 +00:00
parent 456e269534
commit d8c3992432
3 changed files with 13 additions and 19 deletions

View file

@ -352,7 +352,7 @@ final class BuildSettings: NSObject {
static let authScreenShowSocialLoginSection = true
// MARK: - Authentication Options
static let authEnableRefreshTokens = true
static let authEnableRefreshTokens = false
// MARK: - Unified Search
static let unifiedSearchScreenShowPublicDirectory = true

15
Podfile
View file

@ -13,10 +13,9 @@ use_frameworks!
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK 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
# $matrixSDKVersion = '= 0.20.16'
$matrixSDKVersion = '= 0.20.16'
# $matrixSDKVersion = :local
# $matrixSDKVersion = { :branch => 'develop'}
$matrixSDKVersion = { :branch => 'langleyd/5292_refresh_tokens'}
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
########################################
@ -50,8 +49,8 @@ end
########################################
def import_MatrixKit_pods
pod 'HPGrowingTextView', '~> 1.1'
pod 'libPhoneNumber-iOS', '~> 0.9.13'
pod 'HPGrowingTextView', '~> 1.1'
pod 'libPhoneNumber-iOS', '~> 0.9.13'
pod 'DTCoreText', '~> 1.6.25'
#pod 'DTCoreText/Extension', '~> 1.6.25'
pod 'Down', '~> 0.11.0'
@ -97,7 +96,7 @@ abstract_target 'RiotPods' do
pod 'SideMenu', '~> 6.5'
pod 'DSWaveformImage', '~> 6.1.1'
pod 'ffmpeg-kit-ios-audio', '4.5.1'
pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
target 'RiotTests' do
@ -112,11 +111,11 @@ abstract_target 'RiotPods' do
target "RiotSwiftUI" do
import_SwiftUI_pods
end
end
target "RiotSwiftUITests" do
import_SwiftUI_pods
end
end
target "SiriIntents" do
import_MatrixSDK
@ -151,4 +150,4 @@ post_install do |installer|
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
end
end
end
end

View file

@ -116,8 +116,8 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `langleyd/5292_refresh_tokens`)
- MatrixSDK/JingleCallStack (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `langleyd/5292_refresh_tokens`)
- MatrixSDK (= 0.20.16)
- MatrixSDK/JingleCallStack (= 0.20.16)
- OLMKit
- PostHog (~> 1.4.4)
- ReadMoreTextView (~> 3.0.1)
@ -157,6 +157,7 @@ SPEC REPOS:
- libPhoneNumber-iOS
- LoggerAPI
- Logging
- MatrixSDK
- OLMKit
- PostHog
- ReadMoreTextView
@ -176,17 +177,11 @@ EXTERNAL SOURCES:
AnalyticsEvents:
:branch: release/swift
:git: https://github.com/matrix-org/matrix-analytics-events.git
MatrixSDK:
:branch: langleyd/5292_refresh_tokens
:git: https://github.com/matrix-org/matrix-ios-sdk.git
CHECKOUT OPTIONS:
AnalyticsEvents:
:commit: 8058dc6ec07ce0acfe5fdb19eb7e309b0c13845c
:git: https://github.com/matrix-org/matrix-analytics-events.git
MatrixSDK:
:commit: b9cbc3bd378c55c5317725e3dbebf18a1cd5d0fc
:git: https://github.com/matrix-org/matrix-ios-sdk.git
SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
@ -214,7 +209,7 @@ SPEC CHECKSUMS:
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatrixSDK: fbef8eb1793f8c2b5233bee493b6b1bbe93ae3f7
MatrixSDK: af6a70532bb43af59f43a1f4dae512a26afeab0b
OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@ -230,6 +225,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: c5f0584d20a092fba207f356f7487bdbea129ab8
PODFILE CHECKSUM: c9a50c445e32b40b22fadd0f54b376f1bd624ebb
COCOAPODS: 1.11.2