Skip to content

Commit 3536322

Browse files
committed
Merge branch 'release/1.11.6/master'
2 parents d786f7b + 065b6a5 commit 3536322

23 files changed

+121
-80
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: true
22
contact_links:
33
- name: Enhancement or feature request
4-
url: https://github.com/vector-im/element-meta/discussions/categories/ideas
4+
url: https://github.com/element-hq/element-meta/discussions/categories/ideas
55
about: Do you have a suggestion or feature request?
66
- name: Element iOS Community Support
77
url: https://matrix.to/#/#element-ios:matrix.org

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Pull Request Checklist
22

3-
- [ ] I read the [contributing guide](https://github.com/vector-im/element-ios/blob/develop/CONTRIBUTING.md)
3+
- [ ] I read the [contributing guide](https://github.com/element-hq/element-ios/blob/develop/CONTRIBUTING.md)
44
- [ ] UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
55
- [ ] Accessibility has been taken into account.
66
* [ ] Pull request is based on the develop branch

.github/workflows/triage-incoming.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
add_to_triage:
1818
runs-on: ubuntu-latest
1919
if: >
20-
github.repository == 'vector-im/element-ios'
20+
github.repository == 'element-hq/element-ios'
2121
steps:
2222
- uses: octokit/[email protected]
2323
with:

.github/workflows/triage-move-labelled.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
3838
with:
3939
action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
40-
project-url: "https://github.com/vector-im/element-ios/projects/12"
40+
project-url: "https://github.com/element-hq/element-ios/projects/12"
4141
column-name: "Need info"
4242
label-name: "X-Needs-Info"
4343

@@ -55,7 +55,7 @@ jobs:
5555
steps:
5656
- uses: actions/add-to-project@main
5757
with:
58-
project-url: https://github.com/orgs/vector-im/projects/18
58+
project-url: https://github.com/orgs/element-hq/projects/18
5959
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
6060

6161
add_product_issues_to_project:
@@ -66,7 +66,7 @@ jobs:
6666
steps:
6767
- uses: actions/add-to-project@main
6868
with:
69-
project-url: https://github.com/orgs/vector-im/projects/28
69+
project-url: https://github.com/orgs/element-hq/projects/28
7070
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
7171

7272
ex_plorers:
@@ -77,7 +77,7 @@ jobs:
7777
steps:
7878
- uses: actions/add-to-project@main
7979
with:
80-
project-url: https://github.com/orgs/vector-im/projects/73
80+
project-url: https://github.com/orgs/element-hq/projects/73
8181
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
8282

8383
ps_features1:
@@ -93,7 +93,7 @@ jobs:
9393
steps:
9494
- uses: actions/add-to-project@main
9595
with:
96-
project-url: https://github.com/orgs/vector-im/projects/56
96+
project-url: https://github.com/orgs/element-hq/projects/56
9797
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
9898

9999
ps_features2:
@@ -105,7 +105,7 @@ jobs:
105105
steps:
106106
- uses: actions/add-to-project@main
107107
with:
108-
project-url: https://github.com/orgs/vector-im/projects/58
108+
project-url: https://github.com/orgs/element-hq/projects/58
109109
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
110110

111111
ps_features3:
@@ -116,7 +116,7 @@ jobs:
116116
steps:
117117
- uses: actions/add-to-project@main
118118
with:
119-
project-url: https://github.com/orgs/vector-im/projects/57
119+
project-url: https://github.com/orgs/element-hq/projects/57
120120
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
121121

122122
voip:
@@ -127,5 +127,5 @@ jobs:
127127
steps:
128128
- uses: actions/add-to-project@main
129129
with:
130-
project-url: https://github.com/orgs/vector-im/projects/41
130+
project-url: https://github.com/orgs/element-hq/projects/41
131131
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-review-requests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
headers: '{"GraphQL-Features": "projects_next_graphql"}'
1515
query: |
1616
query find_team_members($team: String!) {
17-
organization(login: "vector-im") {
17+
organization(login: "element-hq") {
1818
team(slug: $team) {
1919
members {
2020
nodes {
@@ -81,7 +81,7 @@ jobs:
8181
headers: '{"GraphQL-Features": "projects_next_graphql"}'
8282
query: |
8383
query find_team_members($team: String!) {
84-
organization(login: "vector-im") {
84+
organization(login: "element-hq") {
8585
team(slug: $team) {
8686
members {
8787
nodes {

CHANGES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## Changes in 1.11.6 (2024-01-09)
2+
3+
🙌 Improvements
4+
5+
- Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)).
6+
7+
🧱 Build
8+
9+
- Update CocoaPods and other gems. ([#7720](https://github.com/element-hq/element-ios/pull/7720))
10+
11+
112
## Changes in 1.11.5 (2023-11-28)
213

314
🙌 Improvements

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Please read the matrix-ios-sdk [contributing guide](https://github.com/matrix-or
77
## I want to help translating
88

99
If you want to fix an issue for an English string, please submit a pull request to the Element iOS GitHub repository.
10-
If you want to fix an issue for another language, add a missing translation, or add a new language, please read [Element Web translating guide](https://github.com/vector-im/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
10+
If you want to fix an issue for another language, add a missing translation, or add a new language, please read [Element Web translating guide](https://github.com/element-hq/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
1111

1212
If you have any question regarding translations please ask in [Element Translation room](https://matrix.to/#/#element-translations:matrix.org).
1313

@@ -26,7 +26,7 @@ Otherwise please have a look to [Apple Swift conventions](https://swift.org/docu
2626

2727
## Pull request
2828

29-
When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/vector-im/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
29+
When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/element-hq/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
3030

3131
## Thanks
3232

Config/AppVersion.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
//
1616

1717
// Version
18-
MARKETING_VERSION = 1.11.5
19-
CURRENT_PROJECT_VERSION = 1.11.5
18+
MARKETING_VERSION = 1.11.6
19+
CURRENT_PROJECT_VERSION = 1.11.6

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gem "xcode-install"
44
gem "fastlane"
5-
gem "cocoapods", '~>1.13.0'
5+
gem "cocoapods", '~>1.14.3'
66
gem "slather"
77

88
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ GEM
99
specs:
1010
CFPropertyList (3.0.6)
1111
rexml
12-
activesupport (7.0.8)
12+
activesupport (7.1.2)
13+
base64
14+
bigdecimal
1315
concurrent-ruby (~> 1.0, >= 1.0.2)
16+
connection_pool (>= 2.2.5)
17+
drb
1418
i18n (>= 1.6, < 2)
1519
minitest (>= 5.1)
20+
mutex_m
1621
tzinfo (~> 2.0)
1722
addressable (2.8.5)
1823
public_suffix (>= 2.0.2, < 6.0)
@@ -21,31 +26,33 @@ GEM
2126
json (>= 1.5.1)
2227
artifactory (3.0.15)
2328
atomos (0.1.3)
24-
aws-eventstream (1.2.0)
25-
aws-partitions (1.828.0)
26-
aws-sdk-core (3.183.1)
29+
aws-eventstream (1.3.0)
30+
aws-partitions (1.859.0)
31+
aws-sdk-core (3.188.0)
2732
aws-eventstream (~> 1, >= 1.0.2)
2833
aws-partitions (~> 1, >= 1.651.0)
2934
aws-sigv4 (~> 1.5)
3035
jmespath (~> 1, >= 1.6.1)
31-
aws-sdk-kms (1.71.0)
32-
aws-sdk-core (~> 3, >= 3.177.0)
36+
aws-sdk-kms (1.73.0)
37+
aws-sdk-core (~> 3, >= 3.188.0)
3338
aws-sigv4 (~> 1.1)
34-
aws-sdk-s3 (1.136.0)
35-
aws-sdk-core (~> 3, >= 3.181.0)
39+
aws-sdk-s3 (1.140.0)
40+
aws-sdk-core (~> 3, >= 3.188.0)
3641
aws-sdk-kms (~> 1)
3742
aws-sigv4 (~> 1.6)
38-
aws-sigv4 (1.6.0)
43+
aws-sigv4 (1.7.0)
3944
aws-eventstream (~> 1, >= 1.0.2)
4045
babosa (1.0.4)
46+
base64 (0.2.0)
47+
bigdecimal (3.1.4)
4148
claide (1.1.0)
4249
clamp (1.3.2)
43-
cocoapods (1.13.0)
50+
cocoapods (1.14.3)
4451
addressable (~> 2.8)
4552
claide (>= 1.0.2, < 2.0)
46-
cocoapods-core (= 1.13.0)
53+
cocoapods-core (= 1.14.3)
4754
cocoapods-deintegrate (>= 1.0.3, < 2.0)
48-
cocoapods-downloader (>= 1.6.0, < 2.0)
55+
cocoapods-downloader (>= 2.1, < 3.0)
4956
cocoapods-plugins (>= 1.0.0, < 2.0)
5057
cocoapods-search (>= 1.0.0, < 2.0)
5158
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -58,7 +65,7 @@ GEM
5865
nap (~> 1.0)
5966
ruby-macho (>= 2.3.0, < 3.0)
6067
xcodeproj (>= 1.23.0, < 2.0)
61-
cocoapods-core (1.13.0)
68+
cocoapods-core (1.14.3)
6269
activesupport (>= 5.0, < 8)
6370
addressable (~> 2.8)
6471
algoliasearch (~> 1.0)
@@ -69,7 +76,7 @@ GEM
6976
public_suffix (~> 4.0)
7077
typhoeus (~> 1.0)
7178
cocoapods-deintegrate (1.0.5)
72-
cocoapods-downloader (1.6.3)
79+
cocoapods-downloader (2.1)
7380
cocoapods-plugins (1.0.0)
7481
nap
7582
cocoapods-search (1.0.1)
@@ -82,17 +89,19 @@ GEM
8289
commander (4.6.0)
8390
highline (~> 2.0.0)
8491
concurrent-ruby (1.2.2)
92+
connection_pool (2.4.1)
8593
declarative (0.0.20)
8694
digest-crc (0.6.5)
8795
rake (>= 12.0.0, < 14.0.0)
88-
domain_name (0.5.20190701)
89-
unf (>= 0.0.5, < 1.0.0)
96+
domain_name (0.6.20231109)
9097
dotenv (2.8.1)
98+
drb (2.2.0)
99+
ruby2_keywords
91100
emoji_regex (3.2.3)
92101
escape (0.0.4)
93102
ethon (0.16.0)
94103
ffi (>= 1.15.0)
95-
excon (0.103.0)
104+
excon (0.104.0)
96105
faraday (1.10.3)
97106
faraday-em_http (~> 1.0)
98107
faraday-em_synchrony (~> 1.0)
@@ -122,7 +131,7 @@ GEM
122131
faraday_middleware (1.2.0)
123132
faraday (~> 1.0)
124133
fastimage (2.2.7)
125-
fastlane (2.216.0)
134+
fastlane (2.217.0)
126135
CFPropertyList (>= 2.3, < 4.0.0)
127136
addressable (>= 2.8, < 3.0.0)
128137
artifactory (~> 3.0)
@@ -163,18 +172,18 @@ GEM
163172
xcpretty (~> 0.3.0)
164173
xcpretty-travis-formatter (>= 0.0.3)
165174
fastlane-plugin-brew (0.1.1)
166-
fastlane-plugin-sentry (1.15.0)
175+
fastlane-plugin-sentry (1.16.0)
167176
os (~> 1.1, >= 1.1.4)
168177
fastlane-plugin-versioning (0.5.2)
169178
fastlane-plugin-xcodegen (1.1.0)
170179
fastlane-plugin-brew (~> 0.1.1)
171-
ffi (1.16.2)
180+
ffi (1.16.3)
172181
fourflusher (2.3.1)
173182
fuzzy_match (2.0.4)
174183
gh_inspector (1.1.3)
175-
google-apis-androidpublisher_v3 (0.50.0)
184+
google-apis-androidpublisher_v3 (0.53.0)
176185
google-apis-core (>= 0.11.0, < 2.a)
177-
google-apis-core (0.11.1)
186+
google-apis-core (0.11.2)
178187
addressable (~> 2.5, >= 2.5.1)
179188
googleauth (>= 0.16.2, < 2.a)
180189
httpclient (>= 2.8.1, < 3.a)
@@ -187,19 +196,19 @@ GEM
187196
google-apis-core (>= 0.11.0, < 2.a)
188197
google-apis-playcustomapp_v1 (0.13.0)
189198
google-apis-core (>= 0.11.0, < 2.a)
190-
google-apis-storage_v1 (0.19.0)
191-
google-apis-core (>= 0.9.0, < 2.a)
199+
google-apis-storage_v1 (0.29.0)
200+
google-apis-core (>= 0.11.0, < 2.a)
192201
google-cloud-core (1.6.0)
193202
google-cloud-env (~> 1.0)
194203
google-cloud-errors (~> 1.0)
195204
google-cloud-env (1.6.0)
196205
faraday (>= 0.17.3, < 3.0)
197206
google-cloud-errors (1.3.1)
198-
google-cloud-storage (1.44.0)
207+
google-cloud-storage (1.45.0)
199208
addressable (~> 2.8)
200209
digest-crc (~> 0.4)
201210
google-apis-iamcredentials_v1 (~> 0.1)
202-
google-apis-storage_v1 (~> 0.19.0)
211+
google-apis-storage_v1 (~> 0.29.0)
203212
google-cloud-core (~> 1.6)
204213
googleauth (>= 0.16.2, < 2.a)
205214
mini_mime (~> 1.0)
@@ -220,24 +229,25 @@ GEM
220229
jwt (2.7.1)
221230
mini_magick (4.12.0)
222231
mini_mime (1.1.5)
223-
mini_portile2 (2.8.4)
232+
mini_portile2 (2.8.5)
224233
minitest (5.20.0)
225234
molinillo (0.8.0)
226235
multi_json (1.15.0)
227236
multipart-post (2.3.0)
237+
mutex_m (0.2.0)
228238
nanaimo (0.3.0)
229239
nap (1.1.0)
230240
naturally (2.2.1)
231241
netrc (0.11.0)
232-
nokogiri (1.15.4)
242+
nokogiri (1.15.5)
233243
mini_portile2 (~> 2.8.2)
234244
racc (~> 1.4)
235245
optparse (0.1.1)
236246
os (1.1.4)
237247
plist (3.7.0)
238248
public_suffix (4.0.7)
239-
racc (1.7.1)
240-
rake (13.0.6)
249+
racc (1.7.3)
250+
rake (13.1.0)
241251
representable (3.2.0)
242252
declarative (< 0.1.0)
243253
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -257,11 +267,11 @@ GEM
257267
simctl (1.6.10)
258268
CFPropertyList
259269
naturally
260-
slather (2.7.4)
270+
slather (2.8.0)
261271
CFPropertyList (>= 2.2, < 4)
262272
activesupport
263273
clamp (~> 1.3)
264-
nokogiri (>= 1.13.9)
274+
nokogiri (>= 1.14.3)
265275
xcodeproj (~> 1.21)
266276
terminal-notifier (2.0.0)
267277
terminal-table (3.0.2)
@@ -271,15 +281,12 @@ GEM
271281
tty-screen (0.8.1)
272282
tty-spinner (0.9.3)
273283
tty-cursor (~> 0.7)
274-
typhoeus (1.4.0)
284+
typhoeus (1.4.1)
275285
ethon (>= 0.9.0)
276286
tzinfo (2.0.6)
277287
concurrent-ruby (~> 1.0)
278288
uber (0.1.0)
279-
unf (0.1.4)
280-
unf_ext
281-
unf_ext (0.0.8.2)
282-
unicode-display_width (2.4.2)
289+
unicode-display_width (2.5.0)
283290
webrick (1.8.1)
284291
word_wrap (1.0.0)
285292
xcode-install (2.8.1)
@@ -301,7 +308,7 @@ PLATFORMS
301308
ruby
302309

303310
DEPENDENCIES
304-
cocoapods (~> 1.13.0)
311+
cocoapods (~> 1.14.3)
305312
fastlane
306313
fastlane-plugin-diawi!
307314
fastlane-plugin-sentry

0 commit comments

Comments
 (0)