diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift index 597876852..52b041656 100644 --- a/Config/AppConfiguration.swift +++ b/Config/AppConfiguration.swift @@ -15,7 +15,6 @@ // import Foundation -import MatrixKit /// AppConfiguration is CommonConfiguration plus configurations dedicated to the app class AppConfiguration: CommonConfiguration { diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift index 44c32742c..0919c08fd 100644 --- a/Config/BuildSettings.swift +++ b/Config/BuildSettings.swift @@ -16,8 +16,6 @@ import Foundation -import MatrixKit - /// BuildSettings provides settings computed at build time. /// In future, it may be automatically generated from xcconfig files @objcMembers diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift index f2e4b68dc..5edcacc37 100644 --- a/Config/CommonConfiguration.swift +++ b/Config/CommonConfiguration.swift @@ -15,7 +15,7 @@ // import Foundation -import MatrixKit +import MatrixSDK /// CommonConfiguration is the central point to setup settings for MatrixSDK, MatrixKit and common configurations for all targets. class CommonConfiguration: NSObject, Configurable { diff --git a/Config/Configurable.swift b/Config/Configurable.swift index a5a6d980e..acfb97605 100644 --- a/Config/Configurable.swift +++ b/Config/Configurable.swift @@ -15,9 +15,7 @@ // import Foundation - -import Foundation -import MatrixKit +import MatrixSDK /// Configurable expose settings app and its entensions must use. @objc protocol Configurable { diff --git a/Podfile b/Podfile index 2fed586f1..298eddf8c 100644 --- a/Podfile +++ b/Podfile @@ -6,43 +6,55 @@ platform :ios, '12.1' # Use frameforks to allow usage of pod written in Swift (like PiwikTracker) use_frameworks! -# Different flavours of pods to MatrixKit. Can be one of: -# - a String indicating an official MatrixKit released version number +# Different flavours of pods to MatrixSDK. Can be one of: +# - a String indicating an official MatrixSDK released version number # - `:local` (to use Development Pods) -# - `{'kit branch name' => 'sdk branch name'}` to depend on specific branches of each repo -# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI +# - `{ :branch => 'sdk branch name'}` to depend on specific branch of MatrixSDK repo +# - `{ :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 -$matrixKitVersion = '= 0.16.10' -# $matrixKitVersion = :local -# $matrixKitVersion = {'develop' => 'develop'} +$matrixSDKVersion = '= 0.20.10' +# $matrixSDKVersion = :local +# $matrixSDKVersion = { :branch => 'develop'} ######################################## -case $matrixKitVersion +case $matrixSDKVersion when :local -$matrixKitVersionSpec = { :path => '../matrix-ios-kit/MatrixKit.podspec' } $matrixSDKVersionSpec = { :path => '../matrix-ios-sdk/MatrixSDK.podspec' } -when Hash # kit branch name => sdk branch name – or {kit spec Hash} => {sdk spec Hash} -kit_spec, sdk_spec = $matrixKitVersion.first # extract first and only key/value pair; key is kit_spec, value is sdk_spec -kit_spec = { :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => kit_spec.to_s } unless kit_spec.is_a?(Hash) -sdk_spec = { :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => sdk_spec.to_s } unless sdk_spec.is_a?(Hash) -$matrixKitVersionSpec = kit_spec +when Hash +spec_mode, sdk_spec = $matrixSDKVersion.first # extract first and only key/value pair; key is spec_mode, value is sdk_spec + + case spec_mode + when :branch + # :branch => sdk branch name + sdk_spec = { :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => sdk_spec.to_s } unless sdk_spec.is_a?(Hash) + when :specHash + # :specHash => {sdk spec Hash} + sdk_spec = sdk_spec + end + $matrixSDKVersionSpec = sdk_spec -when String # specific MatrixKit released version -$matrixKitVersionSpec = $matrixKitVersion -$matrixSDKVersionSpec = {} +when String # specific MatrixSDK released version +$matrixSDKVersionSpec = $matrixSDKVersion end -# Method to import the MatrixKit -def import_MatrixKit +# Method to import the MatrixSDK +def import_MatrixSDK pod 'MatrixSDK', $matrixSDKVersionSpec pod 'MatrixSDK/JingleCallStack', $matrixSDKVersionSpec - pod 'MatrixKit', $matrixKitVersionSpec end ######################################## +def import_MatrixKit_pods + 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' +end + def import_SwiftUI_pods pod 'Introspect', '~> 0.1' end @@ -66,7 +78,8 @@ abstract_target 'RiotPods' do pod 'SwiftLint', '~> 0.44.0' target "Riot" do - import_MatrixKit + import_MatrixSDK + import_MatrixKit_pods import_SwiftUI_pods @@ -89,7 +102,8 @@ abstract_target 'RiotPods' do end target "RiotShareExtension" do - import_MatrixKit + import_MatrixSDK + import_MatrixKit_pods end target "RiotSwiftUI" do @@ -101,11 +115,13 @@ abstract_target 'RiotPods' do end target "SiriIntents" do - import_MatrixKit + import_MatrixSDK + import_MatrixKit_pods end target "RiotNSE" do - import_MatrixKit + import_MatrixSDK + import_MatrixKit_pods end end diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html index fc4b54a43..b615810b2 100644 --- a/Riot/Assets/third_party_licenses.html +++ b/Riot/Assets/third_party_licenses.html @@ -15,21 +15,7 @@

This application is making use of the following third party softwares:

-