Skip to content

Commit

Permalink
Merge pull request #4 from eachchat/release/v3.0.5
Browse files Browse the repository at this point in the history
feat: upgrade element version to v1.11.4
  • Loading branch information
kevinlee607 authored Dec 6, 2023
2 parents 1ec4efb + f8cbf8a commit d426e64
Show file tree
Hide file tree
Showing 92 changed files with 1,217 additions and 559 deletions.
86 changes: 32 additions & 54 deletions Brewfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,91 +2,77 @@
"entries": {
"brew": {
"xcodegen": {
"version": "2.35.0",
"version": "2.28.0",
"bottle": {
"rebuild": 0,
"root_url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles",
"root_url": "https://ghcr.io/v2/homebrew/core",
"files": {
"arm64_ventura": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/xcodegen-2.35.0.arm64_ventura.bottle.tar.gz",
"sha256": "ca9aa5cf7c7a4573bd3ff2c1afbe871566e57478c09967abca7585fc1c237470"
},
"arm64_monterey": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/xcodegen-2.35.0.arm64_monterey.bottle.tar.gz",
"sha256": "dadb3716295017a392da394eb0bb52360d95e9142e21ac5532e1d29def593ad6"
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:fa493f26e65f0bb0c6be559a395efb84009d842d55035c8fcfd7bcc35096fd17",
"sha256": "fa493f26e65f0bb0c6be559a395efb84009d842d55035c8fcfd7bcc35096fd17"
},
"arm64_big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/xcodegen-2.35.0.arm64_big_sur.bottle.tar.gz",
"sha256": "6026a0e84873586f7e65584bd3e9a9456f4b590c2498ebf986e563d66bccb3a7"
},
"ventura": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/xcodegen-2.35.0.ventura.bottle.tar.gz",
"sha256": "bb982470aad36dececfab94449696b1a327ea931b61475832fd41c5fa59ebb60"
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:54ce7cba17293f6eabd644af8c8855ca5ac46f4e8475e5a1a961053d31061210",
"sha256": "54ce7cba17293f6eabd644af8c8855ca5ac46f4e8475e5a1a961053d31061210"
},
"monterey": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/xcodegen-2.35.0.monterey.bottle.tar.gz",
"sha256": "366403595292790a4a84e2db6f0f32c14fa907c77ac424a5e24d431d372e7a17"
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:261df12ea22b281c6683113755a95887213aec51a345851d3671eec6a82dd169",
"sha256": "261df12ea22b281c6683113755a95887213aec51a345851d3671eec6a82dd169"
},
"big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/xcodegen-2.35.0.big_sur.bottle.tar.gz",
"sha256": "6db46a3673d4cd395cabd22bbe28e701eef7eaa4f198829fd8a4df072eb9a6ff"
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:24936b2f648842c026cc0da57ac4d2a04669a1bd459af06d20acfbfa3a1c33da",
"sha256": "24936b2f648842c026cc0da57ac4d2a04669a1bd459af06d20acfbfa3a1c33da"
},
"catalina": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:d7b4298a5833f5c2abaa8f19cd60f1da2f13379b9534d67746ac5a37b754e1bd",
"sha256": "d7b4298a5833f5c2abaa8f19cd60f1da2f13379b9534d67746ac5a37b754e1bd"
}
}
}
},
"mint": {
"version": "0.17.5",
"version": "0.17.1",
"bottle": {
"rebuild": 0,
"root_url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles",
"root_url": "https://ghcr.io/v2/homebrew/core",
"files": {
"arm64_ventura": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.arm64_ventura.bottle.tar.gz",
"sha256": "250948fe6fc14179d7c381d084a90d6796861ba9a8456617cadda9ac62cbc2b8"
},
"arm64_monterey": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.arm64_monterey.bottle.tar.gz",
"sha256": "6546b80b980a45036415162189dd340b1f8d3f4e82a80d40a24e7b5dd672eb04"
"url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:1c0ec84137dd50cf949a68e1b8d3729956e2843e1cc48c6827d26e6d7dbc74fc",
"sha256": "1c0ec84137dd50cf949a68e1b8d3729956e2843e1cc48c6827d26e6d7dbc74fc"
},
"arm64_big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.arm64_big_sur.bottle.tar.gz",
"sha256": "39f9d254b248a44bb44e399081b7e50a6c598834e2bf86bb7de3ebc349f11e0d"
},
"ventura": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.ventura.bottle.tar.gz",
"sha256": "068f9984e81b578f2ed6cef4cc9659835a689bdecf121651ea24ebcfefd49339"
"url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:c57aaea4b6eb863ef946bafe3a77f3d32ad4e10e05876b7c6b2df8f8b9656f4e",
"sha256": "c57aaea4b6eb863ef946bafe3a77f3d32ad4e10e05876b7c6b2df8f8b9656f4e"
},
"monterey": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.monterey.bottle.tar.gz",
"sha256": "f8b09a640942548a151c7450c85f33d40162c7540049666131740d49c68e61e6"
"url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:5faf98e60b6d18332bcac4ab076f6ba861ee7daea4c23a85f97e6c8fa3d1f463",
"sha256": "5faf98e60b6d18332bcac4ab076f6ba861ee7daea4c23a85f97e6c8fa3d1f463"
},
"big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.big_sur.bottle.tar.gz",
"sha256": "528ea907912e8002cd3a769e8ddda4556cf2482122c3f848a7d923146df37101"
"url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:3ccf422821dd5fc82488f8e0ab2a11efb645901527b8cf9c42979cc152a9ce02",
"sha256": "3ccf422821dd5fc82488f8e0ab2a11efb645901527b8cf9c42979cc152a9ce02"
},
"catalina": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:d09ea36619994628564fb3d7e8e71b8c368c59f68e29174fb84b9b127bd9290e",
"sha256": "d09ea36619994628564fb3d7e8e71b8c368c59f68e29174fb84b9b127bd9290e"
},
"x86_64_linux": {
"cellar": "/home/linuxbrew/.linuxbrew/Cellar",
"url": "https://mirrors.ustc.edu.cn/homebrew-bottles/bottles/mint-0.17.5.x86_64_linux.bottle.tar.gz",
"sha256": "7c8dd63f0310a46f67550f92ee48a370fadfc1a4d884b8a3904a36b7b610b3f2"
"url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:1d73dd0102396a53abac4721557dc7d7c2897bdb0e95551e04869c48d11df764",
"sha256": "1d73dd0102396a53abac4721557dc7d7c2897bdb0e95551e04869c48d11df764"
}
}
}
},
"getsentry/tools/sentry-cli": {
"version": "2.20.0",
"bottle": false
}
}
},
Expand All @@ -99,14 +85,6 @@
"CLT": "",
"Xcode": "13.3",
"macOS": "12.3.1"
},
"ventura": {
"HOMEBREW_VERSION": "4.0.21",
"HOMEBREW_PREFIX": "/opt/homebrew",
"Homebrew/homebrew-core": "api",
"CLT": "",
"Xcode": "14.3.1",
"macOS": "13.4.1"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions BroadcastUploadExtension/target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ targets:
sources:
- path: .
- path: ../Config/BuildSettings.swift
- path: ../Config/MDMSettings.swift
- path: ../Riot/Categories/Bundle.swift
- path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
71 changes: 71 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,74 @@
## Changes in 1.11.4 (2023-10-04)

🙌 Improvements

- Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)).
- Allow the use of Jitsi for 1:1 calls via a well-known configuration flag. ([#7684](https://github.com/vector-im/element-ios/issues/7684))


## Changes in 1.11.3 (2023-09-13)

🐛 Bugfixes

- Show OIDC account management UI using embedded browser instead of system browser. ([#7671](https://github.com/vector-im/element-ios/issues/7671))
- Hide Sign Out X/All Sessions buttons in the Device Manager when using OIDC. ([#7672](https://github.com/vector-im/element-ios/issues/7672))


## Changes in 1.11.2 (2023-09-12)

🙌 Improvements

- Upgrade MatrixSDK version ([v0.27.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.2)).

🐛 Bugfixes

- Fix an issue where rooms were not correctly sorted after forwarding a message. ([#7641](https://github.com/vector-im/element-ios/issues/7641))
- Add phone number UI and explanatory text is hidden if the 3 pid changes capability is disabled. ([#7670](https://github.com/vector-im/element-ios/issues/7670))


## Changes in 1.11.1 (2023-08-29)

✨ Features

- New settings cell to manage your account through MAS if the home server allows it. ([#7653](https://github.com/vector-im/element-ios/issues/7653))

🙌 Improvements

- Upgrade MatrixSDK version ([v0.27.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1)).

🐛 Bugfixes

- Prevent mention crashes when room members are missing display names (objc interop) ([#7649](https://github.com/vector-im/element-ios/pull/7649))
- Add email UI is hidden if the 3 pid changes capability is disabled. ([#7645](https://github.com/vector-im/element-ios/issues/7645))
- You can now log out from other sessions using MAS on supported OIDC home servers. ([#7646](https://github.com/vector-im/element-ios/issues/7646))
- Deactivate account is hidden for servers with OIDC auth. ([#7648](https://github.com/vector-im/element-ios/issues/7648))
- Prevent pill crashes when room members are missing display names (objc interop) ([#7651](https://github.com/vector-im/element-ios/issues/7651))


## Changes in 1.11.0 (2023-08-15)

✨ Features

- Integrate Device Dehydration v2 through the Crypto SDK ([#7630](https://github.com/vector-im/element-ios/pull/7630))

🙌 Improvements

- Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)).
- Disable Siri, Share and Reply (from NSE) Extensions. ([#7618](https://github.com/vector-im/element-ios/issues/7618))

🐛 Bugfixes

- Fix bug in SSO URL generation that was non-compliant with the spec. ([#7639](https://github.com/vector-im/element-ios/pull/7639))
- Fix a crash when opening v11 rooms. ([#7633](https://github.com/vector-im/element-ios/issues/7633))


## Changes in 1.10.14 (2023-06-21)

🙌 Improvements

- Upgrade MatrixSDK version ([v0.26.12](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.12)).


## Changes in 1.10.13 (2023-06-13)

✨ Features
Expand Down
4 changes: 2 additions & 2 deletions Config/AppVersion.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
//

// Version
MARKETING_VERSION = 3.0.1
CURRENT_PROJECT_VERSION = 3.0.1
MARKETING_VERSION = 3.0.4
CURRENT_PROJECT_VERSION = 3.0.4
21 changes: 13 additions & 8 deletions Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,24 @@ final class BuildSettings: NSObject {
static let forceHomeserverSelection = false

/// Default server proposed on the authentication screen
static let serverConfigDefaultHomeserverUrlString = "https://chat.yunify.com"
static var serverConfigDefaultHomeserverUrlString: String {
MDMSettings.serverConfigDefaultHomeserverUrlString ?? "https://chat.yunify.com"
}

/// Default identity server
static let serverConfigDefaultIdentityServerUrlString = "https://ids.yunify.com"

static let serverConfigSygnalAPIUrlString = "https://push.yunify.com/_matrix/push/v1/notify"
static var serverConfigSygnalAPIUrlString: String {
MDMSettings.serverConfigSygnalAPIUrlString ?? "https://push.yunify.com/_matrix/push/v1/notify"
}

// MARK: - Legal URLs

// Note: Set empty strings to hide the related entry in application settings
static let applicationCopyrightUrlString = ""
static let applicationPrivacyPolicyUrlString = ""
static let applicationPrivacyPolicyUrlString = "https://yunify.com/policy/privacy-policy.html"
static let applicationAcceptableUsePolicyUrlString = "https://element.io/acceptable-use-policy-terms"
static let applicationHelpUrlString =
"https://element.io/help"
static let applicationHelpUrlString = "https://element.io/help"


// MARK: - Permalinks
Expand Down Expand Up @@ -149,7 +152,9 @@ final class BuildSettings: NSObject {
// This baseURL is used to generate permalinks within the app (E.g. timeline message permalinks).
// Optional String that when set is used as permalink base, when nil matrix.to format is used.
// Example value would be "https://www.example.com", note there is no trailing '/'.
static let clientPermalinkBaseUrl: String? = nil
static var clientPermalinkBaseUrl: String? {
MDMSettings.clientPermalinkBaseUrl
}

// MARK: - VoIP
static var allowVoIPUsage: Bool {
Expand Down Expand Up @@ -197,7 +202,7 @@ final class BuildSettings: NSObject {
#else
/// The configuration to use for analytics. Set `isEnabled` to false to disable analytics.
static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "im.vector.app"),
host: "https://posthog.hss.element.io",
host: "https://posthog.element.io",
apiKey: "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
termsURL: URL(string: "https://element.io/cookie-policy")!)
#endif
Expand Down Expand Up @@ -318,7 +323,7 @@ final class BuildSettings: NSObject {
// MARK: - Room Creation Screen

static let roomCreationScreenAllowEncryptionConfiguration: Bool = true
static let roomCreationScreenRoomIsEncrypted: Bool = false
static let roomCreationScreenRoomIsEncrypted: Bool = true
static let roomCreationScreenAllowRoomTypeConfiguration: Bool = true
static let roomCreationScreenRoomIsPublic: Bool = false

Expand Down
52 changes: 52 additions & 0 deletions Config/MDMSettings.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
//
// Copyright 2023 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

import Foundation

enum MDMSettings {
private static let appleManagedConfigurationKey = "com.apple.configuration.managed"

private enum Key: String {
case serverConfigDefaultHomeserverUrlString = "im.vector.app.serverConfigDefaultHomeserverUrlString"
case serverConfigSygnalAPIUrlString = "im.vector.app.serverConfigSygnalAPIUrlString"
case clientPermalinkBaseUrl = "im.vector.app.clientPermalinkBaseUrl"
}

static var serverConfigDefaultHomeserverUrlString: String? {
valueForKey(.serverConfigDefaultHomeserverUrlString) as? String
}

static var serverConfigSygnalAPIUrlString: String? {
valueForKey(.serverConfigSygnalAPIUrlString) as? String
}

static var clientPermalinkBaseUrl: String? {
valueForKey(.clientPermalinkBaseUrl) as? String
}

// MARK: - Private

static private func valueForKey(_ key: Key) -> Any? {
guard let managedConfiguration = UserDefaults.standard.dictionary(forKey: appleManagedConfigurationKey) else {
print("MDM configuration missing")
return nil
}

print("Retrieved MDM configuration: \(managedConfiguration)")

return managedConfiguration[key.rawValue]
}
}
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

gem "xcode-install"
gem "fastlane"
gem "cocoapods", '~>1.11.2'
gem "cocoapods", '~>1.13.0'
gem "slather"

plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
Expand Down
Loading

0 comments on commit d426e64

Please sign in to comment.