Skip to content

Commit

Permalink
Merge branch 'release/1.0.5/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ismailgulek committed Aug 13, 2020
2 parents 9162e9f + 46515c1 commit fffac34
Show file tree
Hide file tree
Showing 188 changed files with 4,261 additions and 1,413 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Expand Up @@ -32,4 +32,6 @@ Pods/
# Fastlane
fastlane/report.xml
fastlane/Reports
fastlane/README.md
fastlane/README.md

provisioning_profiles/
30 changes: 30 additions & 0 deletions CHANGES.rst
@@ -1,3 +1,33 @@
Changes in 1.0.5 (2020-08-13)
=================================================

Features:
*

Improvements:
* Upgrade MatrixKit version ([v0.12.12](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.12.12)).
*

Bugfix:
* Fix pin code cell selection.
* Fix default orientation crash.
* Fix rooms list swipe actions tint colors (#3507).

API Change:
*

Translations:
*

Others:
*

Build:
* Integrate fastlane deliver (#3519).

Test:
*

Changes in 1.0.4 (2020-08-07)
=================================================

Expand Down
3 changes: 3 additions & 0 deletions Config/AppConfiguration.swift
Expand Up @@ -28,6 +28,9 @@ class AppConfiguration: CommonConfiguration {
}

private func setupAppSettings() {
// Enable CallKit for app
MXKAppSettings.standard()?.isCallKitEnabled = true

// Enable long press on event in bubble cells
MXKRoomBubbleTableViewCell.disableLongPressGesture(onEvent: false)

Expand Down
16 changes: 16 additions & 0 deletions Config/BuildSettings.swift
Expand Up @@ -54,6 +54,22 @@ final class BuildSettings: NSObject {
return baseBundleIdentifier + ".ios.dev"
}

static var pushKitAppId: String {
#if DEBUG
return pushKitAppIdDev
#else
return pushKitAppIdProd
#endif
}

static var pusherAppId: String {
#if DEBUG
return pusherAppIdDev
#else
return pusherAppIdProd
#endif
}

// Element-Web instance for the app
static let applicationWebAppUrlString = "https://app.element.io"

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"

gem "xcode-install"
gem "fastlane"
gem "fastlane", '~>2.156.0'
gem "cocoapods", '~>1.9.3'

plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Expand Up @@ -14,7 +14,7 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.351.0)
aws-partitions (1.354.0)
aws-sdk-core (3.104.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
Expand All @@ -23,8 +23,8 @@ GEM
aws-sdk-kms (1.36.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.75.0)
aws-sdk-core (~> 3, >= 3.104.1)
aws-sdk-s3 (1.78.0)
aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1)
Expand Down Expand Up @@ -93,7 +93,7 @@ GEM
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.2.0)
fastlane (2.154.0)
fastlane (2.156.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
Expand Down Expand Up @@ -225,7 +225,7 @@ GEM
xcode-install (2.6.6)
claide (>= 0.9.1, < 1.1.0)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.17.1)
xcodeproj (1.18.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -241,7 +241,7 @@ PLATFORMS

DEPENDENCIES
cocoapods (~> 1.9.3)
fastlane
fastlane (~> 2.156.0)
fastlane-plugin-versioning
xcode-install

Expand Down
3 changes: 2 additions & 1 deletion Podfile
Expand Up @@ -11,7 +11,7 @@ use_frameworks!
# - `{ {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
$matrixKitVersion = '0.12.11'
$matrixKitVersion = '= 0.12.12'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}

Expand Down Expand Up @@ -72,6 +72,7 @@ abstract_target 'RiotPods' do
pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
pod 'KTCenterFlowLayout', '~> 1.3.1'
pod 'ZXingObjC', '~> 3.6.5'
pod 'FlowCommoniOS', '~> 1.8.7'

target 'RiotTests' do
inherit! :search_paths
Expand Down
38 changes: 21 additions & 17 deletions Podfile.lock
Expand Up @@ -38,6 +38,7 @@ PODS:
- DTFoundation/Core
- DTFoundation/UIKit (1.7.14):
- DTFoundation/Core
- FlowCommoniOS (1.8.7)
- GBDeviceInfo (6.3.0):
- GBDeviceInfo/Core (= 6.3.0)
- GBDeviceInfo/Core (6.3.0)
Expand All @@ -51,38 +52,38 @@ PODS:
- MatomoTracker (7.2.1):
- MatomoTracker/Core (= 7.2.1)
- MatomoTracker/Core (7.2.1)
- MatrixKit (0.12.11):
- MatrixKit (0.12.12):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.23)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.12.11)
- MatrixSDK (= 0.16.10)
- MatrixKit/AppExtension (0.12.11):
- MatrixKit/Core (= 0.12.12)
- MatrixSDK (= 0.16.11)
- MatrixKit/AppExtension (0.12.12):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.23)
- DTCoreText/Extension
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.16.10)
- MatrixKit/Core (0.12.11):
- MatrixSDK (= 0.16.11)
- MatrixKit/Core (0.12.12):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.23)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.16.10)
- MatrixSDK (0.16.10):
- MatrixSDK/Core (= 0.16.10)
- MatrixSDK/Core (0.16.10):
- MatrixSDK (= 0.16.11)
- MatrixSDK (0.16.11):
- MatrixSDK/Core (= 0.16.11)
- MatrixSDK/Core (0.16.11):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.2.2)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.1.0)
- Realm (~> 4.4.0)
- MatrixSDK/JingleCallStack (0.16.10):
- MatrixSDK/JingleCallStack (0.16.11):
- JitsiMeetSDK (~> 2.8.1)
- MatrixSDK/Core
- MatrixSDK/SwiftSupport (0.16.10):
- MatrixSDK/SwiftSupport (0.16.11):
- MatrixSDK/Core
- OLMKit (3.1.0):
- OLMKit/olmc (= 3.1.0)
Expand All @@ -107,12 +108,13 @@ PODS:
DEPENDENCIES:
- cmark
- DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
- FlowCommoniOS (~> 1.8.7)
- GBDeviceInfo (~> 6.3.0)
- KeychainAccess (~> 4.2)
- KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.2.0)
- MatrixKit (= 0.12.11)
- MatrixKit/AppExtension (= 0.12.11)
- MatrixKit (= 0.12.12)
- MatrixKit/AppExtension (= 0.12.12)
- MatrixSDK
- MatrixSDK/JingleCallStack
- MatrixSDK/SwiftSupport
Expand All @@ -130,6 +132,7 @@ SPEC REPOS:
- DGCollectionViewLeftAlignFlowLayout
- DTCoreText
- DTFoundation
- FlowCommoniOS
- GBDeviceInfo
- GZIP
- HPGrowingTextView
Expand All @@ -155,6 +158,7 @@ SPEC CHECKSUMS:
DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
DTCoreText: 0298d372ccc137e51f27b3ec1af65fd4af5d173a
DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c
FlowCommoniOS: 1647a1775b988f5d97202f635bcbcbce4f4c46a1
GBDeviceInfo: a3f39dba1a04dcb630abff65d6f7e8fbf319eadd
GZIP: af5c90ef903776a7e9afe6ebebd794a84a2929d4
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
Expand All @@ -164,8 +168,8 @@ SPEC CHECKSUMS:
libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
MatomoTracker: 246b6b0693cf39b356134dec7561f719d3538b96
MatrixKit: 6c5ba4a7673475eca2ad38bbfa02122a502fd03c
MatrixSDK: a9793d20448ee7cbe8acd8650fa319ea0b11d273
MatrixKit: cb92677c837ca56448a2f938717c9be6c7d03973
MatrixSDK: 021fe99187eb3eb6999997039bcdcfcacb8b50aa
OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
Realm: 4eb04d7487bd43c0581256f40b424eafb711deff
Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
Expand All @@ -174,6 +178,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 4f5106309b0939cb9dca5512fc9880a78a8b4926
PODFILE CHECKSUM: c9fbf64577fd39d125dfea51f638685bde771786

COCOAPODS: 1.9.3

0 comments on commit fffac34

Please sign in to comment.