diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8cbef5ecc7..d781e5b540 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: true contact_links: - name: Enhancement or feature request - url: https://github.com/vector-im/element-meta/discussions/categories/ideas + url: https://github.com/element-hq/element-meta/discussions/categories/ideas about: Do you have a suggestion or feature request? - name: Element iOS Community Support url: https://matrix.to/#/#element-ios:matrix.org diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml new file mode 100644 index 0000000000..11f3280cc9 --- /dev/null +++ b/.github/workflows/triage-incoming.yml @@ -0,0 +1,37 @@ +name: Move new issues onto Issue triage board + +on: + issues: + types: [opened] + +jobs: + automate-project-columns: + runs-on: ubuntu-latest + steps: + - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488 + with: + project: Issue triage + column: Incoming + repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }} + + add_to_triage: + runs-on: ubuntu-latest + if: > + github.repository == 'element-hq/element-ios' + steps: + - uses: octokit/graphql-action@v2.x + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + mutation add_to_project($projectid:ID!,$contentid:ID!) { + addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { + item { + id + } + } + } + projectid: ${{ env.PROJECT_ID }} + contentid: ${{ github.event.issue.node_id }} + env: + PROJECT_ID: "PVT_kwDOAM0swc4AMlHr" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml index 130326b3d9..4282571424 100644 --- a/.github/workflows/triage-move-labelled.yml +++ b/.github/workflows/triage-move-labelled.yml @@ -37,7 +37,7 @@ jobs: - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338 with: action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}" - project-url: "https://github.com/vector-im/element-ios/projects/12" + project-url: "https://github.com/element-hq/element-ios/projects/12" column-name: "Need info" label-name: "X-Needs-Info" @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/18 + project-url: https://github.com/orgs/element-hq/projects/18 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} add_product_issues_to_project: @@ -66,7 +66,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/28 + project-url: https://github.com/orgs/element-hq/projects/28 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ex_plorers: @@ -77,7 +77,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/73 + project-url: https://github.com/orgs/element-hq/projects/73 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ps_features1: @@ -93,7 +93,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/56 + project-url: https://github.com/orgs/element-hq/projects/56 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ps_features2: @@ -105,7 +105,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/58 + project-url: https://github.com/orgs/element-hq/projects/58 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ps_features3: @@ -116,7 +116,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/57 + project-url: https://github.com/orgs/element-hq/projects/57 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} voip: @@ -127,5 +127,5 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/41 + project-url: https://github.com/orgs/element-hq/projects/41 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/.github/workflows/triage-review-requests.yml b/.github/workflows/triage-review-requests.yml new file mode 100644 index 0000000000..d5396d48ed --- /dev/null +++ b/.github/workflows/triage-review-requests.yml @@ -0,0 +1,139 @@ +name: Move pull requests asking for review to the relevant project +on: + pull_request_target: + types: [review_requested] + +jobs: + add_design_pr_to_project: + name: Move PRs asking for design review to the design board + runs-on: ubuntu-latest + steps: + - uses: octokit/graphql-action@v2.x + id: find_team_members + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + query find_team_members($team: String!) { + organization(login: "element-hq") { + team(slug: $team) { + members { + nodes { + login + } + } + } + } + } + team: ${{ env.TEAM }} + env: + TEAM: "design" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + - id: any_matching_reviewers + run: | + # Fetch requested reviewers, and people who are on the team + echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json + echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json + jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt + jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt + + # Fetch requested team reviewers, and the name of the team + echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json + jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt + echo '${{ env.TEAM }}' | tee /tmp/team.txt + + # If either a reviewer matches a team member, or a team matches our team, say "true" + if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then + echo "::set-output name=match::true" + elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then + echo "::set-output name=match::true" + else + echo "::set-output name=match::false" + fi + env: + TEAM: "design" + - uses: octokit/graphql-action@v2.x + id: add_to_project + if: steps.any_matching_reviewers.outputs.match == 'true' + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + mutation add_to_project($projectid:ID!, $contentid:ID!) { + addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { + item { + id + } + } + } + projectid: ${{ env.PROJECT_ID }} + contentid: ${{ github.event.pull_request.node_id }} + env: + PROJECT_ID: "PVT_kwDOAM0swc0sUA" + TEAM: "design" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + + add_product_pr_to_project: + name: Move PRs asking for product review to the product board + runs-on: ubuntu-latest + steps: + - uses: octokit/graphql-action@v2.x + id: find_team_members + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + query find_team_members($team: String!) { + organization(login: "element-hq") { + team(slug: $team) { + members { + nodes { + login + } + } + } + } + } + team: ${{ env.TEAM }} + env: + TEAM: "product" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + - id: any_matching_reviewers + run: | + # Fetch requested reviewers, and people who are on the team + echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json + echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json + jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt + jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt + + # Fetch requested team reviewers, and the name of the team + echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json + jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt + echo '${{ env.TEAM }}' | tee /tmp/team.txt + + # If either a reviewer matches a team member, or a team matches our team, say "true" + if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then + echo "::set-output name=match::true" + elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then + echo "::set-output name=match::true" + else + echo "::set-output name=match::false" + fi + env: + TEAM: "product" + - uses: octokit/graphql-action@v2.x + id: add_to_project + if: steps.any_matching_reviewers.outputs.match == 'true' + with: + headers: '{"GraphQL-Features": "projects_next_graphql"}' + query: | + mutation add_to_project($projectid:ID!, $contentid:ID!) { + addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { + item { + id + } + } + } + projectid: ${{ env.PROJECT_ID }} + contentid: ${{ github.event.pull_request.node_id }} + env: + PROJECT_ID: "PVT_kwDOAM0swc4AAg6N" + TEAM: "product" + GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/CHANGES.md b/CHANGES.md index 135aeacc0b..b2a673e097 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,14 @@ +## Changes in 1.11.6 (2024-01-09) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)). + +🧱 Build + +- Update CocoaPods and other gems. ([#7720](https://github.com/element-hq/element-ios/pull/7720)) + + ## Changes in 1.11.5 (2023-11-28) 🙌 Improvements diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 17281c5212..cedae9e450 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ Please read the matrix-ios-sdk [contributing guide](https://github.com/matrix-or ## I want to help translating If you want to fix an issue for an English string, please submit a pull request to the Element iOS GitHub repository. -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/). +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/). If you have any question regarding translations please ask in [Element Translation room](https://matrix.to/#/#element-translations:matrix.org). @@ -26,7 +26,7 @@ Otherwise please have a look to [Apple Swift conventions](https://swift.org/docu ## Pull request -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). +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). ## Thanks diff --git a/Gemfile b/Gemfile index a34178384f..b70f43aedd 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "xcode-install" gem "fastlane" -gem "cocoapods", '~>1.13.0' +gem "cocoapods", '~>1.14.3' gem "slather" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Gemfile.lock b/Gemfile.lock index 851230fb3f..02bb363639 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,15 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.8) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) @@ -21,31 +26,33 @@ GEM json (>= 1.5.1) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.828.0) - aws-sdk-core (3.183.1) + aws-eventstream (1.3.0) + aws-partitions (1.859.0) + aws-sdk-core (3.188.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.73.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.140.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (1.7.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) + bigdecimal (3.1.4) claide (1.1.0) clamp (1.3.2) - cocoapods (1.13.0) + cocoapods (1.14.3) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.14.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -58,7 +65,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + cocoapods-core (1.14.3) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -69,7 +76,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -82,17 +89,19 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.2.2) + connection_pool (2.4.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) dotenv (2.8.1) + drb (2.2.0) + ruby2_keywords emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.103.0) + excon (0.104.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -122,7 +131,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.216.0) + fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -163,18 +172,18 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-brew (0.1.1) - fastlane-plugin-sentry (1.15.0) + fastlane-plugin-sentry (1.16.0) os (~> 1.1, >= 1.1.4) fastlane-plugin-versioning (0.5.2) fastlane-plugin-xcodegen (1.1.0) fastlane-plugin-brew (~> 0.1.1) - ffi (1.16.2) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.50.0) + google-apis-androidpublisher_v3 (0.53.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -187,19 +196,19 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.29.0) + google-apis-core (>= 0.11.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.29.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -220,24 +229,25 @@ GEM jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.4) + mini_portile2 (2.8.5) minitest (5.20.0) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.3.0) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - nokogiri (1.15.4) + nokogiri (1.15.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) optparse (0.1.1) os (1.1.4) plist (3.7.0) public_suffix (4.0.7) - racc (1.7.1) - rake (13.0.6) + racc (1.7.3) + rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -257,11 +267,11 @@ GEM simctl (1.6.10) CFPropertyList naturally - slather (2.7.4) + slather (2.8.0) CFPropertyList (>= 2.2, < 4) activesupport clamp (~> 1.3) - nokogiri (>= 1.13.9) + nokogiri (>= 1.14.3) xcodeproj (~> 1.21) terminal-notifier (2.0.0) terminal-table (3.0.2) @@ -271,15 +281,12 @@ GEM tty-screen (0.8.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0) xcode-install (2.8.1) @@ -301,7 +308,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.13.0) + cocoapods (~> 1.14.3) fastlane fastlane-plugin-diawi! fastlane-plugin-sentry diff --git a/Podfile b/Podfile index 00c2801684..fc693dd78d 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ 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.27.4' +$matrixSDKVersion = '= 0.27.5' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } @@ -146,7 +146,7 @@ abstract_target 'TchapPods' do end # Disabled due to crypto corruption issues. - # https://github.com/vector-im/element-ios/issues/7618 + # https://github.com/element-hq/element-ios/issues/7618 # target "RiotShareExtension" do # import_MatrixSDK # import_MatrixKit_pods diff --git a/Podfile.lock b/Podfile.lock index 4d50b877b2..9944489d39 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,9 +39,9 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.27.4): - - MatrixSDK/Core (= 0.27.4) - - MatrixSDK/Core (0.27.4): + - MatrixSDK (0.27.5): + - MatrixSDK/Core (= 0.27.5) + - MatrixSDK/Core (0.27.5): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) @@ -49,7 +49,7 @@ PODS: - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.27.4): + - MatrixSDK/JingleCallStack (0.27.5): - JitsiMeetSDKLite (= 8.1.2-lite) - MatrixSDK/Core - MatrixSDKCrypto (0.3.13) @@ -102,8 +102,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.27.4) - - MatrixSDK/JingleCallStack (= 0.27.4) + - MatrixSDK (= 0.27.5) + - MatrixSDK/JingleCallStack (= 0.27.5) - OLMKit - PostHog (~> 2.0.0) - ReadMoreTextView (~> 3.0.1) @@ -187,7 +187,7 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: da1df31afa59611ec7251ec419a2ceca6d41c7c4 + MatrixSDK: f92ffead50eda83c99786afefed9be739987f338 MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4 OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332 @@ -208,6 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 0560928a7fc299ce39d2e89597ba3e6cc2056bea +PODFILE CHECKSUM: a6293c739492b4ee2d4697abbb601e7c92729aea -COCOAPODS: 1.13.0 +COCOAPODS: 1.14.3 diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved index 28fdda2b19..f406af44f5 100644 --- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift", "state" : { - "revision" : "dfb74c89bf54b41ea000d564d6435ac6444ba6b4", - "version" : "2.18.0" + "revision" : "0aa1308c43451fd077e332f72d6a32135f258834", + "version" : "2.19.0" } }, { diff --git a/Riot/Assets/be.lproj/InfoPlist.strings b/Riot/Assets/be.lproj/InfoPlist.strings new file mode 100644 index 0000000000..3dd0059c8c --- /dev/null +++ b/Riot/Assets/be.lproj/InfoPlist.strings @@ -0,0 +1,11 @@ + + +// Permissions usage explanations +"NSCameraUsageDescription" = "Камера выкарыстоўваецца для відэазванкоў, запісу або загрузкі фота і відэа."; +"NSPhotoLibraryUsageDescription" = "Дайце доступ да фатаграфій, каб выгружаць здымкі і відэа са сваёй бібліятэкі."; +"NSMicrophoneUsageDescription" = "Element патрабуе доступ да вашага мікрафона, каб здзяйсняць і прымаць выклікі, здымаць відэа і запісваць галасавыя паведамленні."; +"NSContactsUsageDescription" = "Яны будуць перададзеныя вашаму серверу ідэнтыфікацыі, каб дапамагчы знайсці вашыя кантакты на Matrix."; +"NSCalendarsUsageDescription" = "Праглядайце свае запланаваныя сустрэчы ў праграме."; +"NSFaceIDUsageDescription" = "Face ID выкарыстоўваецца для доступу да праграмы."; +"NSLocationWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту."; +"NSLocationAlwaysAndWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту."; diff --git a/Riot/Assets/be.lproj/Localizable.strings b/Riot/Assets/be.lproj/Localizable.strings new file mode 100644 index 0000000000..557dbee9b2 --- /dev/null +++ b/Riot/Assets/be.lproj/Localizable.strings @@ -0,0 +1,10 @@ + + +/** General **/ + +"Notification" = "Апавяшчэнне"; + +/** Titles **/ + +/* Message title for a specific person in a named room */ +"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ у %@"; diff --git a/Riot/Assets/be.lproj/Vector.strings b/Riot/Assets/be.lproj/Vector.strings new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/Riot/Assets/be.lproj/Vector.strings @@ -0,0 +1 @@ + diff --git a/Riot/Assets/ka.lproj/Vector.strings b/Riot/Assets/ka.lproj/Vector.strings new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/Riot/Assets/ka.lproj/Vector.strings @@ -0,0 +1 @@ + diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html index ebd5e6b119..edaf6ab3ca 100644 --- a/Riot/Assets/third_party_licenses.html +++ b/Riot/Assets/third_party_licenses.html @@ -1703,7 +1703,7 @@
  • swift-ogg (https://github.com/vector-im/swift-ogg) + href="https://github.com/element-hq/swift-ogg">https://github.com/element-hq/swift-ogg)

    Makes use of code from 5 frameworks: